X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=32e406e66d1174eaff1ab1aa6ff3b0a455ff041e;hb=94861be42591f9ce23b1632cbd6532d7914ff41e;hp=30c4b5999925fe0fc42811806a3b28cba39ce6ad;hpb=9154d589bf4a0dc3310ee79752c71674f69c85a7;p=ndwebbie.git
diff --git a/scripts/scans.pl b/scripts/scans.pl
index 30c4b59..32e406e 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,20 +64,24 @@ 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 $findoldplanet = $dbh->prepare(q{SELECT id FROM planet_stats WHERE x = $1 AND y = $2 AND z = $3 AND tick <= $4 ORDER BY tick DESC LIMIT 1});
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 (id,tick,scan,rid,amount) VALUES(?,?,?,(SELECT id FROM planet_data_types WHERE category = ? AND name = ?), ?)});
+$dbh->begin_work or die 'No transaction';
$newscans->execute or die $dbh->errstr;
+$dbh->pg_savepoint('scans') or die "No savepoint";
while (my $scan = $newscans->fetchrow_hashref){
my $file = get("http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}");
next unless defined $file;
if ($file =~ /((?:\w| )*) (?:Scan|Probe) on (\d+):(\d+):(\d+) in tick (\d+)/){
- $dbh->begin_work;
eval {
my $type = $1;
my $x = $2;
@@ -83,14 +90,14 @@ while (my $scan = $newscans->fetchrow_hashref){
my $tick = $5;
if($dbh->selectrow_array(q{SELECT * FROM scans WHERE scan_id = ? AND tick = ? AND id <> ?},undef,$scan->{scan_id},$tick,$scan->{id})){
- $dbh->rollback;
+ $dbh->pg_rollback_to('scans') or die "rollback didn't work";
$delscan->execute($scan->{id});
$addpoints->execute(-1,$scan->{uid}) if $scan->{uid} > 0;
die "Duplicate scan: $scan->{id} http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}\n";
}
my ($planet) = $dbh->selectrow_array($findplanet,undef,$x,$y,$z,$tick);
unless ($planet){
- $dbh->rollback;
+ $dbh->pg_rollback_to('scans') or die "rollback didn't work";
next;
}
my $scantext = "";
@@ -99,7 +106,7 @@ 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){
+ while($file =~ m/"left">(Metal|Crystal|Eonium)\D+(\d+)\D+(\d+)/g){
$addpdata->execute($planet,$tick,$scan->{id}
,'roid',$1, $2) or die $dbh->errstr;
$addpdata->execute($planet,$tick,$scan->{id}
@@ -109,6 +116,7 @@ while (my $scan = $newscans->fetchrow_hashref){
while ($file =~ m/(\d+):(\d+):(\d+)\D+"left"\>(Attack|Defend|Return)<\/td>| ([^<]*)<\/td> | (\d+)\D+(\d+)/g){
my ($sender) = $dbh->selectrow_array($findplanet,undef,$1,$2,$3,$tick) or die $dbh->errstr;
+ ($sender) = $dbh->selectrow_array($findoldplanet,undef,$1,$2,$3,$tick) if ((not defined $sender) && $4 eq 'Return');
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 +136,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,$target,$planet,$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 +148,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;
}
@@ -164,12 +172,13 @@ while (my $scan = $newscans->fetchrow_hashref){
print "Something wrong with scan $scan->{id} type $type at tick $tick http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}";
}
$parsedscan->execute($tick,$type,$planet,$scan->{id}) or die $dbh->errstr;
- $dbh->commit;
+ $dbh->pg_release('scans') or die "Couldn't save";
+ $dbh->pg_savepoint('scans') or die "Couldn't save";
#$dbh->rollback;
};
if ($@) {
warn $@;
- $dbh->rollback;
+ $dbh->pg_rollback_to('scans') or die "rollback didn't work";
}
}else{
warn "Nothing useful in scan: $scan->{id} http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}\n";
@@ -177,10 +186,13 @@ while (my $scan = $newscans->fetchrow_hashref){
$addpoints->execute(-1,$scan->{uid}) if $scan->{uid} > 0;
}
}
+$dbh->commit;
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;
|