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

diff --git a/scripts/scans.pl b/scripts/scans.pl
index 7eff622..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();
@@ -78,7 +78,11 @@ my $addpdata = $dbh->prepare(q{INSERT INTO planet_data (id,tick,scan,rid,amount)
 $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){
+	$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+)/){
@@ -93,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 = "";
@@ -115,14 +124,14 @@ while (my $scan = $newscans->fetchrow_hashref){
 				$addpdata->execute($planet,$tick,$scan->{id}
 					,'resource',$1, $res) or die $dbh->errstr;
 			}
-			#if($file =~ m{"center">([^<]+)</td><td class="center">([^<]+)</td><td class="center">([^<]+)</td>}){
-			#	$addpdata->execute($planet,$tick,$scan->{id}
-			#		,'planet','Light Usage', $1) or die $dbh->errstr;
-			#	$addpdata->execute($planet,$tick,$scan->{id}
-			#		,'planet','Medium Usage', $2) or die $dbh->errstr;
-			#	$addpdata->execute($planet,$tick,$scan->{id}
-			#		,'planet','Heavy Usage', $3) or die $dbh->errstr;
-			#}
+			if($file =~ m{<td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td>}){
+				$addpdata->execute($planet,$tick,$scan->{id}
+					,'planet','Light Usage', $production{$1}) or die $dbh->errstr;
+				$addpdata->execute($planet,$tick,$scan->{id}
+					,'planet','Medium Usage', $production{$2}) or die $dbh->errstr;
+				$addpdata->execute($planet,$tick,$scan->{id}
+					,'planet','Heavy Usage', $production{$3}) or die $dbh->errstr;
+			}
 			if($file =~ m{<span class="superhighlight">([\d,]+)</span>}){
 				my $res = $1;
 				$res =~ s/,//g;
@@ -190,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 ($@) {