Fix in case planets happens to be 0

[ndwebbie.git] / lib / NDWeb / Controller / Stats.pm

diff --git a/lib/NDWeb/Controller/Stats.pm b/lib/NDWeb/Controller/Stats.pm
index 4b227367ad6fc5ae8d2e4b5999b121c52ccdefd4..9379e99c0aa8574835eb86ddee63728bf49dae7a 100644 (file)
--- 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)
 
@@ -184,7 +184,7 @@ sub planet : Local {
                $c->stash(outgoings => \@missions);
 
                $query = $dbh->prepare(q{
-                       SELECT DISTINCT ON (i.tick,x,y,z,pid,i.name,i.amount) i.id,i.mission, i.name, i.tick,eta
+                       SELECT DISTINCT ON (i.tick,x,y,z,pid,i.name,i.mission,i.amount) i.id,i.mission, i.name, i.tick,eta
                                                , i.amount, coords(x,y,z) AS coords, pid AS planet
                        FROM intel i
                        LEFT OUTER JOIN (planets
@@ -193,7 +193,7 @@ sub planet : Local {
                        WHERE  i.uid = -1
                                AND i.target = ?
                                AND i.tick > tick() - 3
-                       ORDER BY i.tick,x,y,z,pid,i.name,i.amount,i.eta
+                       ORDER BY i.tick,x,y,z,pid,i.name,i.mission,i.amount,i.eta
                });
                $query->execute($id);
                my @incomings;
@@ -299,7 +299,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