Updated getShips

diff --git a/Usermgm.pm b/Usermgm.pm
index 3c58aebd8dabec6a888c3e161cae34154ec6efbb..332a9e1fa6796d5be961662139edd273bc2fe817 100644 (file)
--- 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;