cache graphs, and return not modified

diff --git a/ND.pm b/ND.pm
index 812e0ab63675ef89973a454ab422b388d8730ff9..be254037764266f4872e6ded97a63e4f8809d406 100755 (executable)
--- a/ND.pm
+++ b/ND.pm
@@ -23,6 +23,8 @@ use CGI qw/:standard/;
 use DBI;
 use DBD::Pg qw(:pg_types);
 use Apache2::Request;
+use Apache2::Response;
+use Apache2::RequestUtil;
 use ND::DB;
 use ND::Web::Page;
 use strict;
@@ -33,17 +35,18 @@ $SIG{__WARN__} = sub {$ND::ERROR .= p $_[0]};
 chdir '/var/www/ndawn/code';
 
 sub handler {
-       local $ND::r = shift;
-       local $ND::req = Apache2::Request->new($ND::r, POST_MAX => "1M");
+       my $r = shift;
+       my $req = Apache2::Request->new($r, POST_MAX => "1M");
        local $ND::DBH = ND::DB::DB();
        local $ND::UID;
        local $ND::ERROR;
-       my $page = $ND::req->param('page');
+       my $page = $req->param('page');
+       $r->no_cache;
 
        if ($ENV{'SCRIPT_NAME'} =~ /(\w+)(\.(pl|php|pm))?$/){
                $page = $1 unless $1 eq 'index' and $3 eq 'pl';
        }
-       $page = ND::Web::Page->new(PAGE => $page, DBH => $ND::DBH, URI => $ENV{REQUEST_URI}, USER_AGENT => $ENV{HTTP_USER_AGENT}, HTTP_ACCEPT => $ENV{HTTP_ACCEPT});
+       $page = ND::Web::Page->new(PAGE => $page, DBH => $ND::DBH, URI => $ENV{REQUEST_URI}, USER_AGENT => $ENV{HTTP_USER_AGENT}, HTTP_ACCEPT => $ENV{HTTP_ACCEPT}, R => $r);
        $page->render;
 
        $ND::DBH->rollback unless $ND::DBH->{AutoCommit};
@@ -51,9 +54,9 @@ sub handler {
 
        if ($page->{RETURN}){
                if($page->{RETURN} eq 'REDIRECT'){
-                       $ND::r->headers_out->set(Location => $page->{REDIR_LOCATION});
-                       $ND::r->status(Apache2::Const::REDIRECT);
-                       $ND::r->rflush;
+                       $r->headers_out->set(Location => $page->{REDIR_LOCATION});
+                       $r->status(Apache2::Const::REDIRECT);
+                       $r->rflush;
                }
        }
        return Apache2::Const::OK;

diff --git a/ND/Web/Image.pm b/ND/Web/Image.pm
index bc59e44075adbacf11dad3b9aff821ad52e988c2..792f1ce629cbbab997b311a2ffa3ca2602b82966 100644 (file)
--- a/ND/Web/Image.pm
+++ b/ND/Web/Image.pm
@@ -20,7 +20,6 @@
 package ND::Web::Image;
 use strict;
 use warnings;
-use CGI qw/:standard/;
 
 use base qw/ND::Web::Page/;
 
@@ -33,11 +32,17 @@ sub render {
                $img =  $self->render_body;
        };
        if (defined $img){
-               print header(-type=> 'image/png', -Content_Length => length $img);
-               binmode STDOUT;
-               print $img;
-       }else{
-               print header;
+               if ((my $rc = $self->{R}->meets_conditions) != Apache2::Const::OK){
+                       $self->{R}->status($rc);
+               }else{
+                       $self->{R}->headers_out->set(Content_Length => length $img);
+                       $self->{R}->content_type('image/png');
+                       $self->{R}->rflush;
+                       binmode STDOUT;
+                       print $img;
+               }
+       }elsif(defined $@){
+               $self->{R}->content_type('text/plain');
                print $@;
        }
 };

diff --git a/ND/Web/Pages/Graph.pm b/ND/Web/Pages/Graph.pm
index 835ad86b4c2cd9ae6be6df85efd5f2bc3a3d1018..b280783a4091846cfb643a7389d578ecedc1537e 100644 (file)
--- 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,47 +39,80 @@ sub render_body {
                y1_label => 'size',
                y2_label => 'rest',
        );
-       my $img;
+
+       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,$self->{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*$2+$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},$self->{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},$self->{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});
+               }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});
                }
-       }elsif ($self->{URI} =~ m{^/\w+/alliance(avg)?/(.*)}){
+               $query->execute($x,$y,$z,$ND::TICK) or die $DBH->errstr;
+               $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 ($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});
+               }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});
+               }
+               $query->execute($x,$y) or die $DBH->errstr;
+               $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 ($type eq 'alliance' || $type eq 'allianceavg'){
 
 
                $graph_settings{title} = 'Alliance vs known members';
@@ -96,23 +132,29 @@ 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{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;
+                       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',$self->{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;
 };