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();
my %production = (None => 0, Low => 35, Medium => 65, High => 100);
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+)/){
$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->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 = "";
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_release('scans') or die "Couldn't save";
- $dbh->pg_savepoint('scans') or die "Couldn't save";
#$dbh->rollback;
};
if ($@) {