use base instead of setting @ISA manually

[ndwebbie.git] / ND / Web / Pages / Graph.pm

diff --git a/ND/Web/Pages/Graph.pm b/ND/Web/Pages/Graph.pm
index 7b20efe97ebf34bd9a5564d72d9c1931a1cfb1ef..8618420242965ac1ecd94b282ee1a2f96d1fa8df 100644 (file)
--- a/ND/Web/Pages/Graph.pm
+++ b/ND/Web/Pages/Graph.pm
@@ -24,23 +24,17 @@ use CGI qw/:standard/;
 use ND::Include;
 use ND::Web::Graph;
 
-$ND::PAGES{graph} = {parse => \&parse, process => \&process, render=> \&render};
+use base qw/ND::Web::Image/;
 
-sub parse {
-       my ($uri) = @_;
-       $ND::USETEMPLATE = 0;
-}
+$ND::Web::Page::PAGES{graph} = 'ND::Web::Pages::Graph';
 
-sub process {
-
-}
-
-sub render {
-       my ($DBH,$uri) = @_;
+sub render_body {
+       my $self = shift;
+       my $DBH = $self->{DBH};
 
        my $type;
        my ($x,$y,$z);
-       if ($uri =~ m{^/\w+/(stats|ranks)/(.*)}){
+       if ($self->{URI} =~ m{^/\w+/(stats|ranks)/(.*)}){
                $type = $1;
                if ($2 =~ m{(\d+)(?: |:)(\d+)(?:(?: |:)(\d+))?$}){
                        $x = $1;
@@ -72,28 +66,27 @@ sub render {
                        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,sizerank,valuerank,xprank FROM planets natural join planet_stats WHERE id = planetid($1,$2,$3,$4) ORDER BY tick ASC});
+                               $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,sizerank,valuerank,xprank FROM galaxies WHERE x = $1 AND y = $2  ORDER BY tick ASC});
+                               $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{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;
        }
 
        die 'no image' unless defined $img;
 
-       print header(-type=> 'image/png', -Content_Length => length $img);
-       binmode STDOUT;
-       print $img;
-}
+       return $img;
+};
 
 1;