Merge branch 'master' of ruin.nu:git/ndwebbie

[ndwebbie.git] / scripts / scans.pl

diff --git a/scripts/scans.pl b/scripts/scans.pl
index 3e01d7823944242fdd470a1c7d4cb85f68ffa246..73826cd4c1c1b6e4793676ccbbeb6c1be2dbcb0d 100755 (executable)
--- 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});
@@ -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,undef,$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;
 
@@ -195,7 +202,7 @@ sub addfleet {
                $total += $2;
                push @ships, [$1,$2];
        }
-       $amount = $total if not defined $amount && defined $ships;
+       $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){