X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FGraph.pm;h=45cecda627e39830d8d51bdca1f950f294e42a31;hb=0879282588fe6070eab80acaf29f79a6ed75d124;hp=d03435312a7bae2acbe896939e016bceb0dd8509;hpb=ddce30bcd0e77f6e923788cb7b21ada5c5ec7ce9;p=ndwebbie.git diff --git a/ND/Web/Pages/Graph.pm b/ND/Web/Pages/Graph.pm index d034353..45cecda 100644 --- a/ND/Web/Pages/Graph.pm +++ b/ND/Web/Pages/Graph.pm @@ -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;