X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=main.pl;h=81d7c8f12e8b56687477834b003181cfd8413ffc;hb=cdd543f418350bf065d586dee2f544536a2a1c6f;hp=2231e36e0f26302224473db3955ea58e55bfe40f;hpb=b605bda9fcdf354a7a6e340401a2b7d6fd5e62e9;p=ndwebbie.git

diff --git a/main.pl b/main.pl
index 2231e36..81d7c8f 100644
--- a/main.pl
+++ b/main.pl
@@ -23,6 +23,7 @@ $ND::TEMPLATE->param(TITLE => 'Main Page');
 
 our $BODY;
 our $DBH;
+my $error;
 
 if (param('cmd') eq 'fleet'){
 	$DBH->begin_work;
@@ -37,10 +38,9 @@ if (param('cmd') eq 'fleet'){
 	$delete->execute($id);
 	my $insert = $DBH->prepare('INSERT INTO fleet_ships (fleet,ship,amount) VALUES (?,?,?)');
 	$fleet = param('fleet');
-	while ($fleet =~ m/((?:[A-Z][a-z]+ )*[A-Z][a-z]+)\s+((?:\d+|,)+)/g){
-		my $amount = $2;
-		$amount =~ s/,//;
-		$insert->execute($id,$1,$amount);
+	$fleet =~ s/,//g;
+	while ($fleet =~ m/((?:[A-Z][a-z]+ )*[A-Z][a-z]+)\s+(\d+)/g){
+		$insert->execute($id,$1,$2) or $error .= '<p>'.$DBH->errstr.'</p>';
 	}
 	$fleet = $DBH->prepare('UPDATE fleets SET landing_tick = tick() WHERE id = ?');
 	$fleet->execute($id);
@@ -116,6 +116,7 @@ while (my($fleet,$coords,$mission,$amount,$landing_tick) = $query->fetchrow){
 $BODY->param(Fleets => \@fleets);
 
 $BODY->param(SMS => $sms);
+$BODY->param(Error => $error);
 
 1;