X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=818be591e37d8937162fa6b98f2e3f59631d1d7a;hb=a4b209407c81ec7b71c9c7f8c4d57bb2f77256f4;hp=01560796b13a5ae9cffa733f01cf42596cb69c7f;hpb=61b32a6c6519fa766e690f18426149ffe6ef8fdd;p=ndwebbie.git
diff --git a/scripts/scans.pl b/scripts/scans.pl
index 0156079..818be59 100755
--- a/scripts/scans.pl
+++ b/scripts/scans.pl
@@ -26,7 +26,10 @@ use CGI;
use DBI;
use DBD::Pg qw(:pg_types);
use LWP::Simple;
-use lib qw{/var/www/ndawn/};
+
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+
use ND::DB;
our $dbh = ND::DB::DB();
@@ -73,12 +76,24 @@ 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 = ?), ?)});
+my $addplanetscan = $dbh->prepare(q{INSERT INTO planet_scans
+ (id,tick,planet,metal_roids,metal,crystal_roids,crystal,eonium_roids,eonium
+ ,agents,guards,light,medium,heavy,hidden)
+ VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)});
+my $adddevscan = $dbh->prepare(q{INSERT INTO development_scans
+ (id,tick,planet,light_fac,medium_fac,heavy_fac,amps,distorters
+ ,metal_ref,crystal_ref,eonium_ref,reslabs,fincents,seccents
+ ,travel,infra,hulls,waves,extraction,covert,mining,total)
+ VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+ });
$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){
+ $dbh->pg_release('scans') or die "Couldn't save";
+ $dbh->pg_savepoint('scans') or die "Couldn't save";
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+)/){
@@ -90,14 +105,19 @@ 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";
+ warn "Duplicate scan: $scan->{id} http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}\n";
+ next;
}
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";
+ if ( $x == 0 && $y == 0 && $z == 0 ){
+ $delscan->execute($scan->{id});
+ $addpoints->execute(-1,$scan->{uid}) if $scan->{uid} > 0;
+ }
next;
}
my $scantext = "";
@@ -105,15 +125,26 @@ while (my $scan = $newscans->fetchrow_hashref){
#TODO: something about planet being closed?
}
if ($type eq 'Planet'){
+ my @values = ($scan->{id},$tick,$planet);
$file =~ s/(\d),(\d)/$1$2/g;
- while($file =~ m/(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}
- ,'resource',$1, $3) or die $dbh->errstr;
+
+ while($file =~ m/"center">(Metal|Crystal|Eonium)\D+(\d+)\D+([\d,]+)/g){
+ push @values,$2,$3;
+ }
+ if($file =~ m{Security\ Guards .+? "center">(\d+)
+ .+? "center">(\d+)}sx){
+ push @values,$1,$2;
}
+ if($file =~ m{| ([A-Z][a-z]+) | ([A-Z][a-z]+) | ([A-Z][a-z]+) | }){
+ push @values,$1,$2,$3;
+ }
+ if($file =~ m{([\d,]+)}){
+ push @values,$1;
+ }
+ $addplanetscan->execute(@values);
}elsif ($type eq 'Jumpgate'){
- while ($file =~ m/(\d+):(\d+):(\d+)\D+"left"\>(Attack|Defend|Return)<\/td>([^<]*)<\/td> | (\d+)\D+(\d+)/g){
+ #print "$file\n";
+ while ($file =~ m{(\d+):(\d+):(\d+)\D+(Attack|Defend|Return) | ([^<]*)\D+(\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');
@@ -153,13 +184,15 @@ while (my $scan = $newscans->fetchrow_hashref){
$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
}
}
- } elsif($type eq 'Surface Analysis' || $type eq 'Technology Analysis'){
- my $cat = ($type eq 'Surface Analysis' ? 'struc' : 'tech');
+ } elsif($type eq 'Development'){
+ my @values = ($scan->{id},$tick,$planet);
+ my $total = 0;
while($file =~ m{((?:[a-zA-Z]| )+)(\d+)}sg){
- $addpdata->execute($planet,$tick,$scan->{id}
- ,$cat,$1, $2) or die $dbh->errstr;
+ push @values,$2;
+ $total += $2 if $#values <= 13;
}
-
+ push @values,$total;
+ $adddevscan->execute(@values);
} elsif($type eq 'Unit' || $type eq 'Advanced Unit'){
my $id = addfleet($type,'Full fleet',$file,$planet,undef,$tick,undef,undef,undef);
$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
@@ -172,7 +205,6 @@ 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->pg_savepoint('scans') or die "Couldn't save";
#$dbh->rollback;
};
if ($@) {
@@ -185,6 +217,7 @@ while (my $scan = $newscans->fetchrow_hashref){
$addpoints->execute(-1,$scan->{uid}) if $scan->{uid} > 0;
}
}
+#$dbh->rollback;
$dbh->commit;
sub addfleet {
@@ -202,7 +235,7 @@ sub addfleet {
my @ships;
my $total = 0;
- while(defined $ships && $ships =~ m{((?:[a-zA-Z]| )+) | (\d+)}sg){
+ while(defined $ships && $ships =~ m{((?:[a-zA-Z]| )+) | (\d+)}sg){
$total += $2;
push @ships, [$1,$2];
}