X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FGraph.pm;fp=ND%2FWeb%2FPages%2FGraph.pm;h=688188498d7b9e04e637459a3bde1554dbb43a43;hb=b0a995c77804fa742812cbff518f816df5802d27;hp=8618420242965ac1ecd94b282ee1a2f96d1fa8df;hpb=c58e53cf25bbd2ecf5e3cff6a4545aee1dfd1e51;p=ndwebbie.git

diff --git a/ND/Web/Pages/Graph.pm b/ND/Web/Pages/Graph.pm
index 8618420..6881884 100644
--- a/ND/Web/Pages/Graph.pm
+++ b/ND/Web/Pages/Graph.pm
@@ -19,8 +19,7 @@
 
 package ND::Web::Pages::Graph;
 use strict;
-use warnings;
-use CGI qw/:standard/;
+use warnings FATAL => 'all';
 use ND::Include;
 use ND::Web::Graph;
 
@@ -32,55 +31,83 @@ sub render_body {
 	my $self = shift;
 	my $DBH = $self->{DBH};
 
-	my $type;
-	my ($x,$y,$z);
+	my %graph_settings = (
+		y_number_format => sub { prettyValue abs $_[0]},
+		y1_label => 'size',
+		y2_label => 'rest',
+	);
+	my $img;
 	if ($self->{URI} =~ m{^/\w+/(stats|ranks)/(.*)}){
-		$type = $1;
+		my $type = $1;
+		my ($x,$y,$z);
 		if ($2 =~ m{(\d+)(?: |:)(\d+)(?:(?: |:)(\d+))?$}){
 			$x = $1;
 			$y = $2;
 			$z = $3;
 		}
-	}
+		my $findGraph;
+		if (defined $z){
+			$findGraph = $DBH->prepare(q{SELECT graph FROM planet_graphs WHERE planet = planetid($1,$2,$3,$4) AND tick = $4 AND type = $5});
+			$findGraph->execute($x,$y,$z,$ND::TICK,$type) or die $DBH->errstr;
+		}
+		if (defined $findGraph and my $graph = $findGraph->fetchrow_hashref){
+			$img = $graph->{graph};
+		}elsif(defined $x){
+			my $query;
+			if (defined $z){
+				if ($type eq 'stats'){
+					$query = $DBH->prepare(q{SELECT tick,score,size,value,xp*60 AS "xp*60" FROM planets natural join planet_stats WHERE id = planetid($1,$2,$3,$4) ORDER BY tick ASC});
+				}elsif($type eq 'ranks'){
+					$query = $DBH->prepare(q{SELECT tick,-scorerank AS score,-sizerank AS size,-valuerank AS value,-xprank AS xp FROM planets natural join planet_stats WHERE id = planetid($1,$2,$3,$4) ORDER BY tick ASC});
+				}
+				$query->execute($x,$y,$z,$ND::TICK) or die $DBH->errstr;
+			}else{
+				if ($type eq 'stats'){
+					$query = $DBH->prepare(q{SELECT tick,score,size,value,xp*60 AS "xp*60" FROM galaxies WHERE x = $1 AND y = $2 ORDER BY tick ASC});
+				}elsif($type eq 'ranks'){
+					$query = $DBH->prepare(q{SELECT tick,-scorerank AS score,-sizerank AS size,-valuerank AS value,-xprank AS xp FROM galaxies WHERE x = $1 AND y = $2  ORDER BY tick ASC});
+				}
+				$query->execute($x,$y) or die $DBH->errstr;
+			}
 
-	die "Not a proper type" unless defined $type;
+			$graph_settings{title} = $type;
+			$graph_settings{two_axes} = 1;
+			$graph_settings{use_axis} = [2,1,2,2];
+			$graph_settings{y_max_value} = 0 if $type eq 'ranks';
+			$img = graphFromQuery 500,300,\%graph_settings,$query;
+		}
+	}elsif ($self->{URI} =~ m{^/\w+/alliance(avg)?/(.*)}){
 
-	my %graph_settings = (
-		y_number_format => sub { prettyValue abs $_[0]},
-		title => $type,
-		y1_label => 'size',
-		y2_label => 'rest',
-	);
 
-	my $findGraph;
-	if (defined $z){
-		$findGraph = $DBH->prepare(q{SELECT graph FROM planet_graphs WHERE planet = planetid($1,$2,$3,$4) AND tick = $4 AND type = $5});
-		$findGraph->execute($x,$y,$z,$ND::TICK,$type) or die $DBH->errstr;
-	}
-	my $img;
-	if (defined $findGraph and my $graph = $findGraph->fetchrow_hashref){
-		$img = $graph->{graph};
-	}elsif(defined $x){
+		$graph_settings{title} = 'Alliance vs known members';
+		$graph_settings{two_axes} = 1;
+		$graph_settings{use_axis} = [1,2,1,2];
+		$graph_settings{y2_label} = 'score';
+
 		my $query;
-		if (defined $z){
-			if ($type eq 'stats'){
-				$query = $DBH->prepare(q{SELECT tick,score,size,value,xp*60 AS "xp*60" FROM planets natural join planet_stats WHERE id = planetid($1,$2,$3,$4) ORDER BY tick ASC});
-			}elsif($type eq 'ranks'){
-				$query = $DBH->prepare(q{SELECT tick,-scorerank AS score,-sizerank AS size,-valuerank AS value,-xprank AS xp FROM planets natural join planet_stats WHERE id = planetid($1,$2,$3,$4) ORDER BY tick ASC});
-			}
-			$query->execute($x,$y,$z,$ND::TICK) or die $DBH->errstr;
+		unless (defined $1){
+			$query = $DBH->prepare(q{SELECT a.tick,a.size,a.score,memsize, memscore FROM (SELECT tick,SUM(size) AS memsize,SUM(score) AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.alliance_id = $1 GROUP BY tick) p JOIN alliance_stats a ON a.tick = p.tick
+WHERE a.id = $1 ORDER BY tick});
 		}else{
-			if ($type eq 'stats'){
-				$query = $DBH->prepare(q{SELECT tick,score,size,value,xp*60 AS "xp*60" FROM galaxies WHERE x = $1 AND y = $2 ORDER BY tick ASC});
-			}elsif($type eq 'ranks'){
-				$query = $DBH->prepare(q{SELECT tick,-scorerank AS score,-sizerank AS size,-valuerank AS value,-xprank AS xp FROM galaxies WHERE x = $1 AND y = $2  ORDER BY tick ASC});
-			}
-			$query->execute($x,$y) or die $DBH->errstr;
+			$graph_settings{title} = 'Average alliance vs known members';
+			$query = $DBH->prepare(q{SELECT a.tick,a.size/members AS size,a.score/members AS score,memsize, memscore FROM (SELECT tick,AVG(size) AS memsize,AVG(score) AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.alliance_id = $1 GROUP BY tick) p JOIN alliance_stats a ON a.tick = p.tick
+WHERE a.id = $1 ORDER BY tick});
 		}
-		
+		$query->execute($2) or die $DBH->errstr;
+
+		$img = graphFromQuery 500,300,\%graph_settings,$query;
+	}elsif ($self->{URI} =~ m{^/\w+/planetvsnd/(\d+)}){
+
+
+		$graph_settings{title} = 'You vs ND AVG';
 		$graph_settings{two_axes} = 1;
-		$graph_settings{use_axis} = [2,1,2,2];
-		$graph_settings{y_max_value} = 0 if $type eq 'ranks';
+		$graph_settings{use_axis} = [1,2,1,2];
+		$graph_settings{y2_label} = 'score';
+
+		my $query = $DBH->prepare(q{SELECT a.tick,a.size/members as NDsize,a.score/members AS NDscore,memsize, memscore FROM (SELECT tick,size AS memsize,score AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.id = $1) p JOIN alliance_stats a ON a.tick = p.tick
+WHERE a.id = 1});
+		$query->execute($1) or die $DBH->errstr;
+
 		$img = graphFromQuery 500,300,\%graph_settings,$query;
 	}