X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FStats.pm;h=e2c784d929bb837f33c5504e12dbd2db87d0d236;hb=0fd1ff08781f7be2e32d33a4130de91151f5d461;hp=4b227367ad6fc5ae8d2e4b5999b121c52ccdefd4;hpb=81b74843095bc68e69ad35f2822187fbcae9e2d2;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Stats.pm b/lib/NDWeb/Controller/Stats.pm index 4b22736..e2c784d 100644 --- a/lib/NDWeb/Controller/Stats.pm +++ b/lib/NDWeb/Controller/Stats.pm @@ -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