X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FDefLeeches.pm;h=d187bb62cfce7eeae5eed2643933ce1997507941;hb=34876053e79ee0153b38c8cad7c9404322472f29;hp=21f7dcb5948dbe8fd7d0fe192aaccd23e294cbf6;hpb=d6c9085e748c4d61901aaea72f0e1546dcc7cdda;p=ndwebbie.git

diff --git a/NDWeb/Pages/DefLeeches.pm b/NDWeb/Pages/DefLeeches.pm
index 21f7dcb..d187bb6 100644
--- a/NDWeb/Pages/DefLeeches.pm
+++ b/NDWeb/Pages/DefLeeches.pm
@@ -17,15 +17,15 @@
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
 
-package ND::Web::Pages::DefLeeches;
+package NDWeb::Pages::DefLeeches;
 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{defLeeches} = __PACKAGE__;
+$NDWeb::Page::PAGES{defLeeches} = __PACKAGE__;
 
 
 sub render_body {
@@ -37,9 +37,10 @@ sub render_body {
 	return $self->noAccess unless $self->isDC;
 
 	my $query = $DBH->prepare(q{SELECT username,defense_points,count(id) AS calls, SUM(fleets) AS fleets, SUM(recalled) AS recalled
-		FROM (SELECT username,defense_points,c.id,count(f.target) AS fleets, count(NULLIF(f.landing_tick + f.eta -1 = f.back,TRUE)) AS recalled
-			FROM users u JOIN calls c ON c.member = u.uid LEFT OUTER JOIN fleets f ON u.planet = f.target AND c.landing_tick = f.landing_tick
-			WHERE (f.mission = 'Defend') OR f.target IS NULL
+		FROM (SELECT username,defense_points,c.id,count(f.target) AS fleets, count(NULLIF(f.tick + f.eta -1 = f.back,TRUE)) AS recalled
+			FROM users u JOIN calls c ON c.member = u.uid LEFT OUTER JOIN fleets f ON u.planet = f.target AND c.landing_tick = f.tick
+			WHERE (f.mission = 'Defend' AND f.uid > 0 AND f.back IS NOT NULL AND NOT ingal)
+				OR f.target IS NULL
 			GROUP BY username,defense_points,c.id
 			) d
 		GROUP BY username,defense_points ORDER BY fleets DESC, defense_points
@@ -47,9 +48,7 @@ sub render_body {
 	$query->execute;
 
 	my @members;
-	my $i = 0;
 	while ( my $member = $query->fetchrow_hashref){
-		$member->{ODD} = $i++ % 2;
 		push @members,$member;
 	}
 	$BODY->param(Members => \@members);