# 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;
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);
$extra_columns = ", planet_status,hit_us, alliance,relationship";
}
- my $query = $DBH->prepare(qq{Select id,coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race,
+ my $query = $DBH->prepare(qq{Select p.id,coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race,gov,
size, size_gain, size_gain_day,
score,score_gain,score_gain_day,
value,value_gain,value_gain_day,
scorerank,scorerank_gain,scorerank_gain_day,
valuerank,valuerank_gain,valuerank_gain_day,
xprank,xprank_gain,xprank_gain_day,
- p.value - p.size*200 - coalesce(c.metal+c.crystal+c.eonium,0)/150 - coalesce(c.structures,(SELECT avg(structures) FROM covop_targets)::int)*1500 AS fleetvalue,(c.metal+c.crystal+c.eonium)/100 AS resvalue $extra_columns from current_planet_stats_full p LEFT OUTER JOIN covop_targets c ON p.id = c.planet where x = ? AND y = ? $where order by x,y,z asc});
+ p.value - p.size*200 -
+ COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150 -
+ COALESCE(ss.total ,(SELECT COALESCE(avg(total),0) FROM structure_scans)::int)*1500 AS fleetvalue
+ ,(metal+crystal+eonium)/100 AS resvalue $extra_columns
+ FROM current_planet_stats_full p
+ LEFT OUTER JOIN planet_scans ps ON p.id = ps.planet
+ LEFT OUTER JOIN structure_scans ss ON p.id = ss.planet
+ WHERE x = ? AND y = ? $where ORDER BY x,y,z ASC
+ });
if (defined $z){
$query->execute($x,$y,$z);
}
my @planets;
my $planet_id = undef;
- my $i = 0;
while (my $planet = $query->fetchrow_hashref){
$planet_id = $planet->{id};
for my $type (qw/size score value xp/){
}
}
if ($self->isMember && ($self->isOfficer || $self->isBC)){
- if ($z && $planet->{alliance} eq 'NewDawn' && not ($self->isHC || $self->isOfficer)){
+ if ($z && defined $planet->{alliance} && $planet->{alliance} eq 'NewDawn' && not ($self->isHC || $self->isOfficer)){
log_message $ND::UID,"BC browsing ND planet $planet->{coords} tick $self->{TICK}";
}
}
- $i++;
- $planet->{ODD} = $i % 2;
delete $planet->{id};
push @planets,$planet;
}
$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(x,y,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,x,y,z,i.mission,i.tick,i.name,i.amount,i.ingal,i.uid
+ ORDER BY i.tick,x,y,z
+ });
$query->execute($planet_id);
+ my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships
+ WHERE id = ? ORDER BY num
+ });
my @missions;
- while (my ($mission,$landingtick,$eta,$amount,$target) = $query->fetchrow){
- push @missions,{Target => $target, Mission => $mission, LandingTick => $landingtick
- , ETA => $eta, Amount => $amount};
+ while (my $mission = $query->fetchrow_hashref){
+ $mission->{CLASS} = $mission->{mission};
+ my @ships;
+ $ships->execute($mission->{id});
+ while (my $ship = $ships->fetchrow_hashref){
+ 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 i.id,i.mission, i.name, i.tick AS landingtick,MIN(eta) AS eta
+ , i.amount, coords(x,y,z) AS sender
+ FROM fleets i
+ LEFT OUTER JOIN (planets
+ NATURAL JOIN planet_stats) s ON i.sender = s.id
+ AND s.tick = ( SELECT MAX(tick) FROM planet_stats)
+ WHERE i.uid = -1
+ AND i.target = ?
+ AND (i.tick > tick() - 14 OR i.mission = 'Full fleet')
+ GROUP BY i.id,x,y,z,i.mission,i.tick,i.name,i.amount,i.ingal,i.uid
+ ORDER BY i.tick,x,y,z
+ });
+ $query->execute($planet_id);
+ my @incomings;
+ while (my $mission = $query->fetchrow_hashref){
+ $mission->{CLASS} = $mission->{mission};
+ my @ships;
+ $ships->execute($mission->{id});
+ while (my $ship = $ships->fetchrow_hashref){
+ push @ships,$ship;
+ }
+ push @ships, {ship => 'No', amount => 'ships'} if @ships == 0;
+ $mission->{ships} = \@ships;
+ push @incomings,$mission;
+ }
+ $BODY->param(Incomings => \@incomings);
+
+ $query = $DBH->prepare(q{SELECT value,value_gain AS gain,tick FROM planet_stats
WHERE id = ? AND tick > tick() - 24});
- my $scan = q{
- <p>Value the last 24 ticks</p>
- <table><tr><th>Tick</th><th>Value</th><th>Difference</th></tr>};
- my $old = 0;
$query->execute($planet_id);
- while (my($value,$tick) = $query->fetchrow){
- my $diff = $value-$old;
- $old = $value;
- my $class = 'Defend';
- $class = 'Attack' if $diff < 0;
- $scan .= qq{<tr><td>$tick</td><td>$value</td><td class="$class">$diff</td></tr>};
+ my @values;
+ while (my $value = $query->fetchrow_hashref){
+ $value->{class} = 'Defend';
+ $value->{class} = 'Attack' if $value->{gain} < 0;
+ push @values, $value;
}
- $scan .= q{</table>};
- push @scans, {Scan => $scan};
+ $BODY->param(Values => \@values);
- $query = $DBH->prepare(q{SELECT DISTINCT ON (type) type,scan_id, tick, scan FROM scans WHERE planet = ?
- GROUP BY type,scan_id, tick, scan ORDER BY type,tick DESC});
+ $query = $DBH->prepare(q{SELECT type,scan_id, tick FROM scans
+ WHERE planet = ? AND tick > tick() - 168
+ ORDER BY tick,type DESC
+ });
$query->execute($planet_id);
- my %scans;
- while (my($type,$scan_id,$tick,$scan) = $query->fetchrow){
- $scans{$type} = [$scan_id,$tick,$scan];
+ my @scans;
+ while (my $scan = $query->fetchrow_hashref){
+ push @scans,$scan;
}
+ $BODY->param(Scans => \@scans);
- $query = $DBH->prepare(q{SELECT x,y,z,tick FROM planet_stats WHERE id = ? ORDER BY tick ASC});
- $scan = q{
- <p>Previous Coords</p>
- <table><tr><th>Tick</th><th>Value</th><th>Difference</th></tr>};
+ $query = $DBH->prepare(q{SELECT x,y,z,tick FROM planet_stats
+ WHERE id = ? ORDER BY tick ASC});
$query->execute($planet_id);
- $x = $y = $z = 0;
- while (my($nx,$ny,$nz,$tick) = $query->fetchrow){
- if ($nx != $x || $ny != $y || $nz != $z){
- $x = $nx;
- $y = $ny;
- $z = $nz;
- $scan .= qq{<tr><td>$tick</td><td>$x:$y:$z</td></tr>};
+ my @coords;
+ my $c = {x => 0, y => 0, z => 0};
+ while (my $c2 = $query->fetchrow_hashref){
+ if ($c->{x} != $c2->{x} || $c->{y} != $c2->{y} || $c->{z} != $c2->{z}){
+ $c = $c2;
+ push @coords,$c;
}
}
- $scan .= q{</table>};
- $scan .= $scans{'Ship Classes'}->[2] if $scans{'Ship Classes'};
- push @scans, {Scan => $scan};
-
- for my $type ('Planet','Jumpgate','Unit','Advanced Unit','Surface Analysis','Technology Analysis','Fleet Analysis','News'){
- next unless exists $scans{$type};
- my $scan_id = $scans{$type}->[0];
- my $tick = $scans{$type}->[1];
- my $scan = $scans{$type}->[2];
- if ($self->{TICK} - $tick > 10){
- $scan =~ s{<table( cellpadding="\d+")?>}{<table$1 class="old">};
- }
- push @scans,{Scan => qq{
- <p><b><a href="http://game.planetarion.com/showscan.pl?scan_id=$scan_id">$type</a> Scan from tick $tick</b></p>
- $scan}};
+ $BODY->param(OldCoords => \@coords);
+
+ $query = $DBH->prepare(q{SELECT DISTINCT ON(rid) tick,category,name,amount
+ FROM planet_data pd JOIN planet_data_types pdt ON pd.rid = pdt.id
+ WHERE pd.id = $1 ORDER BY rid,tick DESC
+ });
+ $query->execute($planet_id);
+ my @pdata;
+ while (my $data = $query->fetchrow_hashref){
+ $data->{amount} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000
+ push @pdata,$data;
}
+ $BODY->param(PlanetData => \@pdata);
- $BODY->param(Scans => \@scans);
}
$query = $DBH->prepare(q{SELECT x,y,
size, size_gain, size_gain_day,
$query->execute($x,$y) or $ND::ERROR .= p($DBH->errstr);
my @galaxies;
- $i = 0;
while (my $galaxy = $query->fetchrow_hashref){
for my $type (qw/planets size score xp value/){
#$galaxy->{$type} = prettyValue($galaxy->{$type});
$galaxy->{$type} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000
}
}
- $i++;
- $galaxy->{ODD} = $i % 2;
push @galaxies,$galaxy;
}
$BODY->param(Galaxies => \@galaxies);
projects / ndwebbie.git / blobdiff