X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=73826cd4c1c1b6e4793676ccbbeb6c1be2dbcb0d;hb=721d34ecc1ac357cd325c08790ca41c6218de7d5;hp=40cfc356709ec1731b7b627bd9d17cf1fb1acbf9;hpb=14e523fcb4dc6eb3ce780e0780959187c2610a6f;p=ndwebbie.git

diff --git a/scripts/scans.pl b/scripts/scans.pl
index 40cfc35..73826cd 100755
--- a/scripts/scans.pl
+++ b/scripts/scans.pl
@@ -21,6 +21,7 @@
 
 use strict;
 use warnings;
+no warnings 'exiting';
 use CGI;
 use DBI;
 use DBD::Pg qw(:pg_types);
@@ -36,7 +37,9 @@ our $dbh = ND::DB::DB();
 #print ;
 $dbh->do(q{SET CLIENT_ENCODING TO 'LATIN1';});
 
-my $scangroups = $dbh->prepare(q{SELECT id,scan_id,tick,uid FROM scans WHERE groupscan AND NOT parsed});
+my $scangroups = $dbh->prepare(q{SELECT id,scan_id,tick,uid FROM scans
+	WHERE groupscan AND NOT parsed FOR UPDATE
+});
 my $oldscan = $dbh->prepare(q{SELECT scan_id FROM scans WHERE scan_id = ? AND tick >= tick() - 168});
 my $addScan = $dbh->prepare(q{INSERT INTO scans (scan_id,tick,uid) VALUES (?,?,?)});
 my $parsedscan = $dbh->prepare(q{UPDATE scans SET tick = ?, type = ?, planet = ?, parsed = TRUE WHERE id = ?});
@@ -61,7 +64,9 @@ while (my $group = $scangroups->fetchrow_hashref){
 	$dbh->commit;
 }
 
-my $newscans = $dbh->prepare(q{SELECT id,scan_id,tick,uid FROM scans WHERE NOT groupscan AND NOT parsed});
+my $newscans = $dbh->prepare(q{SELECT id,scan_id,tick,uid FROM scans
+	WHERE NOT groupscan AND NOT parsed FOR UPDATE
+});
 my $findplanet = $dbh->prepare(q{SELECT planetid(?,?,?,?)});
 my $findcoords = $dbh->prepare(q{SELECT * FROM planetcoords(?,?)});
 my $addfleet = $dbh->prepare(q{INSERT INTO fleets (name,mission,sender,target,tick,eta,back,amount,ingal,uid) VALUES(?,?,?,?,?,?,?,?,?,-1) RETURNING id});
@@ -109,7 +114,7 @@ while (my $scan = $newscans->fetchrow_hashref){
 			while ($file =~ m/(\d+):(\d+):(\d+)\D+"left"\>(Attack|Defend|Return)<\/td><td>([^<]*)<\/td><td>(\d+)\D+(\d+)/g){
 				
 				my ($sender) = $dbh->selectrow_array($findplanet,undef,$1,$2,$3,$tick) or die $dbh->errstr;
-				my $id = addfleet($5,$4,"",$sender,$planet,$tick+$6,$6
+				my $id = addfleet($5,$4,undef,$sender,$planet,$tick+$6,$6
 					,undef,$7, $x == $1 && $y == $2);
 				$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
 			}
@@ -128,7 +133,7 @@ while (my $scan = $newscans->fetchrow_hashref){
 					my ($target) = $dbh->selectrow_array($findplanet,undef
 						,$2,$3,$4,$t) or die $dbh->errstr;
 					die "No target: $2:$3:$4" unless defined $target;
-					my $id = addfleet($1,$mission,"",$planet,$target,$6
+					my $id = addfleet($1,$mission,undef,$planet,$target,$6
 						,$eta,$back,undef, ($x == $2 && $y == $3));
 					$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
 				}elsif($news eq 'Incoming' && $text =~ m/We have detected an open jumpgate from (.*?), located at (\d+):(\d+):(\d+). The fleet will approach our system in tick (\d+) and appears to have roughly (\d+) ships/g){
@@ -140,7 +145,7 @@ while (my $scan = $newscans->fetchrow_hashref){
 					my ($target) = $dbh->selectrow_array($findplanet,undef
 						,$2,$3,$4,$t) or die $dbh->errstr;
 					die "No target: $2:$3:$4" unless defined $target;
-					my $id = addfleet($1,$mission,"",$planet,$target,$5
+					my $id = addfleet($1,$mission,undef,$target,$planet,$5
 						,$eta,$back,$6, ($x == $2 && $y == $3));
 					$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
 				}
@@ -181,6 +186,8 @@ while (my $scan = $newscans->fetchrow_hashref){
 sub addfleet {
 	my ($name,$mission,$ships,$sender,$target,$tick,$eta,$back,$amount,$ingal) = @_;
 
+	die "no sender" unless defined $sender;
+
 	$ingal = 0 unless $ingal;
 	$back = $tick + 4 if $ingal && $eta <= 4;
 
@@ -190,13 +197,12 @@ sub addfleet {
 	}
 
 	my @ships;
-	my $total = undef;
-	while($ships =~ m{((?:[a-zA-Z]| )+)</td><td>(\d+)}sg){
-		$total = 0 unless defined $total;
+	my $total = 0;
+	while(defined $ships && $ships =~ m{((?:[a-zA-Z]| )+)</td><td>(\d+)}sg){
 		$total += $2;
 		push @ships, [$1,$2];
 	}
-	$amount = $total unless defined $amount;
+	$amount = $total if (!defined $amount) && defined $ships;
 	my $id = $dbh->selectrow_array($addfleet,undef,$name,$mission,$sender
 		,$target,$tick, $eta, $back, $amount,$ingal) or die $dbh->errstr;
 	for my $s (@ships){