X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FStats.pm;h=a937e35bf6bf636839481d96954ba86adc908f6e;hb=9519c80241167db071e44cbdd1e1843daad6e305;hp=14cd6ed8e4cff987fcfb1a4269e124b910931c25;hpb=7a5cd6e3c2568d51f408ff531d35abe4fa79731c;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Stats.pm b/lib/NDWeb/Controller/Stats.pm index 14cd6ed..a937e35 100644 --- a/lib/NDWeb/Controller/Stats.pm +++ b/lib/NDWeb/Controller/Stats.pm @@ -62,7 +62,7 @@ FROM galaxies g GROUP BY raid,p.tick,x,y ) AS a JOIN galaxies g USING (tick,x,y) - WHERE a.count::float / g.planets >= 0.5 + WHERE a.count::float / NULLIF(g.planets,0) >= 0.5 ORDER BY x,y,tick ) AS raid USING (x,y) @@ -198,14 +198,6 @@ sub planet : Local { $query->execute($id); my @incomings; while (my $mission = $query->fetchrow_hashref){ - my @ships; - $ships->execute($mission->{id}); - if ($ships->rows != 0){ - while (my $ship = $ships->fetchrow_hashref){ - push @ships,$ship; - } - $mission->{ships} = \@ships; - } push @incomings,$mission; } $c->stash(incomings => \@incomings); @@ -299,7 +291,7 @@ GROUP BY tag $c->stash(cloud => $cloud->html); $c->stash(css => $cloud->css); - my $query = $dbh->prepare(q{ + $query = $dbh->prepare(q{ WITH p AS (SELECT pid, coords(x,y,z) FROM current_planet_stats ), t AS (SELECT pid,tag,bool_or(uid = $2) AS own,max(time) AS time FROM planet_tags