X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=30bd8bebe5afa165b3f33a8eab1267c520f1c721;hb=f53e4d4da681453f13e5d18fa73c4377591d4c65;hp=73826cd4c1c1b6e4793676ccbbeb6c1be2dbcb0d;hpb=22eac6e3d83f56412826ad513addfaf54b8eda38;p=ndwebbie.git diff --git a/scripts/scans.pl b/scripts/scans.pl index 73826cd..30bd8be 100755 --- a/scripts/scans.pl +++ b/scripts/scans.pl @@ -26,7 +26,7 @@ use CGI; use DBI; use DBD::Pg qw(:pg_types); use LWP::Simple; -use lib qw{/var/www/ndawn/}; +use lib qw{/var/www/ndawn/lib/}; use ND::DB; our $dbh = ND::DB::DB(); @@ -68,18 +68,22 @@ 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"; + +my %production = (None => 0, Low => 35, Medium => 65, High => 100); 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; @@ -88,14 +92,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 = ""; @@ -104,16 +108,35 @@ 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/"center">(Metal|Crystal|Eonium)\D+(\d+)\D+([\d,]+)/g){ + my ($roids,$res) = ($2,$3); + $roids =~ s/,//g; + $addpdata->execute($planet,$tick,$scan->{id} + ,'roid',$1, $roids) or die $dbh->errstr; + $res =~ s/,//g; + $addpdata->execute($planet,$tick,$scan->{id} + ,'resource',$1, $res) or die $dbh->errstr; + } + if($file =~ m{