X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=inline;f=NDWeb%2FPages%2FCheck.pm;h=38553fe3fa5800d9c921bc989c1647c64f9faf48;hb=a0ed1cdb42b8811b549f2b5028431f3c46a7e262;hp=f68c949f6d4d6bb5d8cd9596b5c4fa44f96a1c10;hpb=d6c9085e748c4d61901aaea72f0e1546dcc7cdda;p=ndwebbie.git diff --git a/NDWeb/Pages/Check.pm b/NDWeb/Pages/Check.pm index f68c949..38553fe 100644 --- a/NDWeb/Pages/Check.pm +++ b/NDWeb/Pages/Check.pm @@ -17,17 +17,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package ND::Web::Pages::Check; +package NDWeb::Pages::Check; use strict; -use warnings FATAL => 'all'; -no warnings qw(uninitialized); +use warnings; use ND::Include; use CGI qw/:standard/; -use ND::Web::Include; +use NDWeb::Include; -use base qw/ND::Web::XMLPage/; +use base qw/NDWeb::XMLPage/; -$ND::Web::Page::PAGES{check} = __PACKAGE__; +$NDWeb::Page::PAGES{check} = __PACKAGE__; sub parse { my $self = shift; @@ -57,7 +56,7 @@ sub render_body { return $BODY; } - if ($self->isMember && param('cmd') eq 'arbiter'){ + if ($self->isMember && defined param('cmd') && param('cmd') eq 'arbiter'){ my $query = $DBH->prepare(q{SELECT count(*) AS friendlies FROM current_planet_stats WHERE x = ? AND y = ? AND (planet_status IN ('Friendly','NAP') OR relationship IN ('Friendly','NAP'))}); my ($count) = $DBH->selectrow_array($query,undef,$x,$y); @@ -130,82 +129,75 @@ sub render_body { $BODY->param(OnePlanet => 1); my $query = $DBH->prepare(q{ - SELECT i.mission, i.tick AS landingtick,MIN(eta) AS eta, i.amount, coords(p.x,p.y,p.z) AS target - FROM intel i - JOIN (planets - NATURAL JOIN planet_stats) p ON i.target = p.id - JOIN (planets - NATURAL JOIN planet_stats) p2 ON i.sender = p2.id - WHERE p.tick = ( SELECT max(tick) FROM planet_stats) AND i.tick > tick() AND i.uid = -1 - AND p2.tick = p.tick AND p2.id = ? - GROUP BY p.x,p.y,p.z,p2.x,p2.y,p2.z,i.mission,i.tick,i.amount,i.ingal,i.uid - ORDER BY p.x,p.y,p.z}); + SELECT i.id,i.mission, i.name, i.tick AS landingtick,MIN(eta) AS eta + , i.amount, coords(t.x,t.y,t.z) AS target + FROM fleets i + LEFT OUTER JOIN (planets + NATURAL JOIN planet_stats) t ON i.target = t.id + AND t.tick = ( SELECT max(tick) FROM planet_stats) + WHERE i.uid = -1 + AND i.sender = ? + AND (i.tick > tick() - 14 OR i.mission = 'Full Fleet') + GROUP BY i.id,t.x,t.y,t.z,i.mission,i.tick,i.name,i.amount,i.ingal,i.uid + ORDER BY i.tick,t.x,t.y,t.z + }); $query->execute($planet_id); + my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships where id = ?}); my @missions; - while (my ($mission,$landingtick,$eta,$amount,$target) = $query->fetchrow){ - push @missions,{Target => $target, Mission => $mission, LandingTick => $landingtick - , ETA => $eta, Amount => $amount}; + $i = 0; + while (my $mission = $query->fetchrow_hashref){ + $mission->{ODD} = $i++ % 2; + $mission->{CLASS} = $mission->{mission}; + my @ships; + $ships->execute($mission->{id}); + my $j = 0; + while (my $ship = $ships->fetchrow_hashref){ + $ship->{ODD} = $j++ % 2; + push @ships,$ship; + } + push @ships, {ship => 'No', amount => 'ships'} if @ships == 0; + $mission->{ships} = \@ships; + push @missions,$mission; } $BODY->param(Missions => \@missions); - my @scans; - $query = $DBH->prepare(q{SELECT value,tick FROM planet_stats + $query = $DBH->prepare(q{SELECT value,value_gain AS gain,tick FROM planet_stats WHERE id = ? AND tick > tick() - 24}); - my $scan = q{ -
Value the last 24 ticks
-Tick | Value | Difference |
---|---|---|
$tick | $value | $diff |
Previous Coords
-Tick | Value | Difference |
---|---|---|
$tick | $x:$y:$z |