From 7ca93b2c5901c56f383e645b5d1985ab7f65635d Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Sun, 9 Sep 2007 17:02:55 +0200
Subject: [PATCH] Updated getShips

---
 Usermgm.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Usermgm.pm b/Usermgm.pm
index 3c58aeb..332a9e1 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -163,11 +163,15 @@ sub laston {
 
 
 sub getShips {
-	my ($ship) = @_;
+	my ($ship,$command) = @_;
 
+	unless (defined $ship){
+		$ND::server->command("notice $ND::nick Usage: .$command ship | % can be used as wildcard, e.g. beet%");
+		return;
+	}
 	if (officer() || dc()){
-		my $f = $ND::DBH->prepare(qq{SELECT username,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 ? ORDER BY amount DESC
+		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
 			});
 		$f->execute($ship);
 		my $text;
-- 
2.39.2