X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FGraph.pm;h=d03435312a7bae2acbe896939e016bceb0dd8509;hb=f6cfe40e6a8da61229131a2d38a2535ae66da359;hp=835ad86b4c2cd9ae6be6df85efd5f2bc3a3d1018;hpb=93c59348304cb9ff046b986699d7bbbdae00be46;p=ndwebbie.git

diff --git a/ND/Web/Pages/Graph.pm b/ND/Web/Pages/Graph.pm
index 835ad86..d034353 100644
--- a/ND/Web/Pages/Graph.pm
+++ b/ND/Web/Pages/Graph.pm
@@ -22,6 +22,9 @@ use strict;
 use warnings FATAL => 'all';
 use ND::Include;
 use ND::Web::Graph;
+use DBI qw(:sql_types);
+use DBD::Pg qw(:pg_types);
+
 
 use base qw/ND::Web::Image/;
 
@@ -36,83 +39,125 @@ sub render_body {
 		y1_label => 'size',
 		y2_label => 'rest',
 	);
-	my $img;
+
+	my ($tick) = $DBH->selectrow_array(q{SELECT max(tick) from planet_stats});
+	my %req;
+	my $type;
 	if ($self->{URI} =~ m{^/\w+/(stats|ranks)/(.*)}){
-		my $type = $1;
-		my ($x,$y,$z);
+		$type = $1;
 		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;
+			$req{x} = $1;
+			$req{y} = $2;
+			$req{z} = $3;
+			if (defined $3){
+				($req{id}) = $DBH->selectrow_array(q{SELECT planetid($1,$2,$3,$4)},undef,$1,$2,$3,$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;
+				$type = "gal$type";
+				$req{id} = 100*$1+$2;
 			}
+		}
+	}elsif($self->{URI} =~ m{^/\w+/(alliance(?:avg)?)/(\d+)}){
+		$type = $1;
+		$req{id} = $2;
+	}elsif($self->{URI} =~ m{^/\w+/planetvsnd/(\d+)}){
+		$type = 'planetvsnd';
+		$req{id} = $1;
+	}
+
+	die 'no real type' unless $type;
+
+	my $findGraph = $DBH->prepare(q{SELECT EXTRACT(EPOCH FROM last_modified) AS last_modified FROM graphs WHERE id = $1 AND tick = $2 AND type = $3});
+	$findGraph->execute($req{id},$tick,$type) or die $DBH->errstr;
+	if (my $graph = $findGraph->fetchrow_hashref){
+		$self->{R}->set_last_modified($graph->{last_modified});
+		if ((my $rc = $self->{R}->meets_conditions) != Apache2::Const::OK){
+			$self->{R}->status($rc);
+			return;
+		}
+		my $findGraph = $DBH->prepare(q{SELECT img FROM graphs WHERE id = $1 AND tick = $2 AND type = $3});
+		$findGraph->execute($req{id},$tick,$type) or die $DBH->errstr;
+		$graph = $findGraph->fetchrow_hashref;
+		return $graph->{img}
+	}
 
-			$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;
+	my $img;
+	my $delGraph = $DBH->prepare(q{DELETE FROM graphs WHERE id = $1 AND type = $2});
+	my $addGraph = $DBH->prepare(q{INSERT INTO graphs (type,id,tick,img) VALUES($1,$2,$3,$4)});
+	if ($type eq 'stats' || $type eq 'ranks'){
+		my $type = $1;
+		my $findGraph;
+		my ($x,$y,$z) = ($req{x},$req{y},$req{z});
+		my $query;
+		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});
+			$graph_settings{y_min_value} = 0;
+		}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});
+			$graph_settings{y_max_value} = 0;
 		}
-	}elsif ($self->{URI} =~ m{^/\w+/alliance(avg)?/(.*)}){
+		$query->execute($x,$y,$z,$tick) or die $DBH->errstr;
+		$graph_settings{title} = "$type: $x:$y:$z";
+		$graph_settings{two_axes} = 1;
+		$graph_settings{use_axis} = [2,1,2,2];
+		$img = graphFromQuery 500,300,\%graph_settings,$query;
+	}elsif ($type eq 'galstats' || $type eq 'galranks'){
+		my $query;
+		my ($x,$y) = ($req{x},$req{y});
+		if ($type eq 'galstats'){
+			$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});
+			$graph_settings{y_min_value} = 0;
+		}elsif($type eq 'galranks'){
+			$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});
+			$graph_settings{y_max_value} = 0;
+		}
+		$query->execute($x,$y) or die $DBH->errstr;
+		$graph_settings{title} = "$type: $x:$y";
+		$graph_settings{two_axes} = 1;
+		$graph_settings{use_axis} = [2,1,2,2];
+		$img = graphFromQuery 500,300,\%graph_settings,$query;
+	}elsif ($type eq 'alliance' || $type eq 'allianceavg'){
 
 
 		$graph_settings{title} = 'Alliance vs known members';
 		$graph_settings{two_axes} = 1;
-		$graph_settings{use_axis} = [1,2,1,2];
+		$graph_settings{use_axis} = [2,1,1,2];
 		$graph_settings{y2_label} = 'score';
 
 		my $query;
-		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
+		if ($type eq 'alliance'){
+			$query = $DBH->prepare(q{SELECT a.tick,a.score,a.size,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{
 			$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
+			$query = $DBH->prepare(q{SELECT a.tick,a.score/members AS score,a.size/members AS size,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+)}){
-
-
+	}elsif ($type eq 'planetvsnd'){
 		$graph_settings{title} = 'You vs ND AVG';
 		$graph_settings{two_axes} = 1;
-		$graph_settings{use_axis} = [1,2,1,2];
+		$graph_settings{use_axis} = [2,1,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 ORDER BY tick});
-		$query->execute($1) or die $DBH->errstr;
+		my $query = $DBH->prepare(q{SELECT a.tick,a.score/members AS NDscore,a.size/members as NDsize,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 ORDER BY tick});
+		$query->execute($req{id}) or die $DBH->errstr;
 
 		$img = graphFromQuery 500,300,\%graph_settings,$query;
 	}
 
 	die 'no image' unless defined $img;
 
+	$delGraph->execute($req{id},$type) or die $DBH->errstr;
+	$addGraph->bind_param('$1',$type,{TYPE => DBI::SQL_VARCHAR }) or die $DBH->errstr;
+	$addGraph->bind_param('$2',$req{id},{TYPE => DBI::SQL_INTEGER }) or die $DBH->errstr;
+	$addGraph->bind_param('$3',$tick,{TYPE => DBI::SQL_INTEGER }) or die $DBH->errstr;
+	$addGraph->bind_param('$4',$img,{TYPE => DBI::SQL_VARBINARY }) or die $DBH->errstr;
+	$addGraph->execute or die $DBH->errstr;
+	$self->{R}->set_last_modified(time);
+
 	return $img;
 };