X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=5b9e74eaf3a535ae718326416688aa18260f960c;hb=e9cf9e399d08b8c5e01ba3cd1359dee1153ce2e1;hp=b4fe22df766f589e9840d470ae8036a2f64a1b24;hpb=1ac7abba88180254eaf3a65e1aded1c6d7c42576;p=ndwebbie.git

diff --git a/scripts/scans.pl b/scripts/scans.pl
index b4fe22d..5b9e74e 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();
@@ -81,6 +81,8 @@ $dbh->pg_savepoint('scans') or die "No savepoint";
 
 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+)/){
@@ -95,11 +97,16 @@ while (my $scan = $newscans->fetchrow_hashref){
 			$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 = "";
@@ -192,8 +199,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_release('scans') or die "Couldn't save";
-		$dbh->pg_savepoint('scans') or die "Couldn't save";
 		#$dbh->rollback;
 		};
 		if ($@) {