X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FPlanetNaps.pm;h=adcd5b7200888737a9a617b6419a0ac306986653;hb=57f880656c4486f68583058121a5bcb3b316199c;hp=1a613809e7db24f0126a7a29ef5a95ef80b6152b;hpb=d6c9085e748c4d61901aaea72f0e1546dcc7cdda;p=ndwebbie.git

diff --git a/NDWeb/Pages/PlanetNaps.pm b/NDWeb/Pages/PlanetNaps.pm
index 1a61380..adcd5b7 100644
--- a/NDWeb/Pages/PlanetNaps.pm
+++ b/NDWeb/Pages/PlanetNaps.pm
@@ -17,15 +17,15 @@
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
 
-package ND::Web::Pages::PlanetNaps;
+package NDWeb::Pages::PlanetNaps;
 use strict;
 use warnings FATAL => 'all';
 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{planetNaps} = __PACKAGE__;
+$NDWeb::Page::PAGES{planetNaps} = __PACKAGE__;
 
 sub render_body {
 	my $self = shift;
@@ -36,14 +36,21 @@ sub render_body {
 	return $self->noAccess unless $self->isHC;
 	my $error;
 
-	my $query = $DBH->prepare(qq{Select coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race, size, score, value, xp, sizerank, scorerank, valuerank, xprank, 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, planet_status,hit_us, alliance,relationship,nick from current_planet_stats p LEFT OUTER JOIN covop_targets c ON p.id = c.planet WHERE planet_status IN ('Friendly','NAP') order by x,y,z asc});
+	my $query = $DBH->prepare(q{SELECT coords(x,y,z)
+		, ((ruler || ' OF ') || p.planet) AS planet,race, size, score, value
+		, xp, sizerank, scorerank, valuerank, xprank, 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, planet_status,hit_us
+		, alliance,relationship,nick 
+		FROM current_planet_stats p
+			LEFT OUTER JOIN planet_scans ps ON p.id = ps.planet
+			LEFT OUTER JOIN structure_scans ss ON p.id = ss.planet
+		WHERE planet_status IN ('Friendly','NAP') order by x,y,z asc});
 
 	$query->execute or $error .= p($DBH->errstr);
 	my @planets;
-	my $i = 0;
 	while (my $planet = $query->fetchrow_hashref){
-		$i++;
-		$planet->{ODD} = $i % 2;
 		push @planets,$planet;
 	}
 	$BODY->param(Planets => \@planets);