scans stay for 168 ticks

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

diff --git a/ND/Web/Pages/Graph.pm b/ND/Web/Pages/Graph.pm
index d757d1345321e20238c83999c0fb0c43fbe612a8..45cecda627e39830d8d51bdca1f950f294e42a31 100644 (file)
--- a/ND/Web/Pages/Graph.pm
+++ b/ND/Web/Pages/Graph.pm
@@ -53,7 +53,7 @@ sub render_body {
                                ($req{id}) = $DBH->selectrow_array(q{SELECT planetid($1,$2,$3,$4)},undef,$1,$2,$3,$tick);
                        }else{
                                $type = "gal$type";
-                               $req{id} = 100*$2+$2;
+                               $req{id} = 100*$1+$2;
                        }
                }
        }elsif($self->{URI} =~ m{^/\w+/(alliance(?:avg)?)/(\d+)}){
@@ -96,7 +96,7 @@ sub render_body {
                        $graph_settings{y_max_value} = 0;
                }
                $query->execute($x,$y,$z,$tick) or die $DBH->errstr;
-               $graph_settings{title} = $type;
+               $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;
@@ -111,7 +111,7 @@ sub render_body {
                        $graph_settings{y_max_value} = 0;
                }
                $query->execute($x,$y) or die $DBH->errstr;
-               $graph_settings{title} = $type;
+               $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;
@@ -126,11 +126,11 @@ sub render_body {
                my $query;
                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});
+WHERE a.id = $1 AND a.tick > (SELECT max(tick) - 50 FROM alliance_stats) ORDER BY tick});
                }else{
                        $graph_settings{title} = 'Average alliance vs known members';
                        $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});
+WHERE a.id = $1  AND a.tick > (SELECT max(tick) - 50 FROM alliance_stats)ORDER BY tick});
                }
                $query->execute($2) or die $DBH->errstr;