X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=73826cd4c1c1b6e4793676ccbbeb6c1be2dbcb0d;hb=721d34ecc1ac357cd325c08790ca41c6218de7d5;hp=999ba864509ca4c8e1ba26b8171707a0b51a9068;hpb=f0bf7599836c6acd50c28dda0dcc57f62be84a1b;p=ndwebbie.git diff --git a/scripts/scans.pl b/scripts/scans.pl index 999ba86..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,9 +37,11 @@ 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 (?,?,COALESCE(?,'-1'))}); +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 = ?}); my $addpoints = $dbh->prepare(q{UPDATE users SET scan_points = scan_points + ? WHERE uid = ? }); my $delscan = $dbh->prepare(q{DELETE FROM scans WHERE id = ?}); @@ -61,14 +64,15 @@ 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}); my $fleetscan = $dbh->prepare(q{INSERT INTO fleet_scans (id,scan) VALUES(?,?)}); my $addships = $dbh->prepare(q{INSERT INTO fleet_ships (id,ship,amount) VALUES(?,?,?)}); -my $addpdata = $dbh->prepare(q{INSERT INTO planet_data (planet,tick,rid,amount,uid) VALUES(?,?,(SELECT id FROM planet_data_types WHERE category = ? AND name = ?), ?,-1) RETURNING id}); -my $pdatascan = $dbh->prepare(q{INSERT INTO data_scans (id,scan) VALUES(?,?)}); +my $addpdata = $dbh->prepare(q{INSERT INTO planet_data (id,tick,scan,rid,amount) VALUES(?,?,?,(SELECT id FROM planet_data_types WHERE category = ? AND name = ?), ?)}); $newscans->execute or die $dbh->errstr; while (my $scan = $newscans->fetchrow_hashref){ @@ -101,18 +105,16 @@ while (my $scan = $newscans->fetchrow_hashref){ if ($type eq 'Planet'){ $file =~ s/(\d),(\d)/$1$2/g; while($file =~ m/(Metal|Crystal|Eonium)\D+(\d+)\D+(\d+)/g){ - my $id = $dbh->selectrow_array($addpdata,undef,$planet,$tick + $addpdata->execute($planet,$tick,$scan->{id} ,'roid',$1, $2) or die $dbh->errstr; - $pdatascan->execute($id,$scan->{id}); - $id = $dbh->selectrow_array($addpdata,undef,$planet,$tick + $addpdata->execute($planet,$tick,$scan->{id} ,'resource',$1, $3) or die $dbh->errstr; - $pdatascan->execute($id,$scan->{id}); } }elsif ($type eq 'Jumpgate'){ while ($file =~ m/(\d+):(\d+):(\d+)\D+"left"\>(Attack|Defend|Return)<\/td>