From: Michael Andreen <harv@ruin.nu>
Date: Tue, 22 Jan 2008 08:15:20 +0000 (+0100)
Subject: Fixed getShips
X-Git-Url: https://ruin.nu/git/%3CTMPL_VAR%20NAME=PAGE%3E?a=commitdiff_plain;h=ca08e0e929a1e51db68f756c2ad637f6b4b610b3;p=NDIRC.git

Fixed getShips
---

diff --git a/Usermgm.pm b/Usermgm.pm
index ee0187e..f8d332a 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -177,9 +177,15 @@ sub getShips {
 		return;
 	}
 	if (officer() || dc()){
-		my $f = $ND::DBH->prepare(qq{SELECT username,SUM(amount) AS amount
-			FROM users u JOIN fleets f USING (uid) JOIN fleet_ships fs ON f.id = fs.fleet WHERE f.fleet = 0 AND ship ILIKE ? GROUP BY username ORDER BY amount DESC
-			});
+		my $f = $ND::DBH->prepare(qq{SELECT username,SUM(fs.amount) AS amount
+			FROM users u 
+				JOIN (SELECT DISTINCT ON (sender) sender AS planet,id FROM fleets
+					WHERE mission = 'Full fleet' AND name <> 'Unit'
+					ORDER BY sender,tick DESC,id DESC) f  USING (planet) 
+				JOIN fleet_ships fs ON f.id = fs.id
+			WHERE ship ILIKE ?
+			GROUP BY username ORDER BY amount DESC
+		});
 		$f->execute($ship);
 		my $text;
 		my $i = 0;