]> ruin.nu Git - ndwebbie.git/commitdiff
Only count fleets from launch confirmation
authorMichael Andreen <harv@ruin.nu>
Tue, 5 Feb 2008 10:07:55 +0000 (11:07 +0100)
committerMichael Andreen <harv@ruin.nu>
Tue, 5 Feb 2008 10:07:55 +0000 (11:07 +0100)
NDWeb/Pages/DefLeeches.pm

index b10e40310ee21030d0fef4aa8c09bb2275920fcf..d187bb62cfce7eeae5eed2643933ce1997507941 100644 (file)
@@ -39,7 +39,8 @@ sub render_body {
        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.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) OR f.target IS NULL
+                       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