X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=30bd8bebe5afa165b3f33a8eab1267c520f1c721;hb=02c7aaff53da28137793c89c32d9994b93db61fb;hp=fa27b0312fd1070fc4e76aea82f2b51bcdbc77e7;hpb=a333f6b98536c67510e7a633740bbc986f0981ef;p=ndwebbie.git

diff --git a/scripts/scans.pl b/scripts/scans.pl
index fa27b03..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();
@@ -78,6 +78,8 @@ 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){
 	my $file = get("http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}");
 	next unless defined $file;
@@ -115,14 +117,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;
@@ -130,7 +132,8 @@ while (my $scan = $newscans->fetchrow_hashref){
 					,'planet','Production', $res) or die $dbh->errstr;
 			}
 		}elsif ($type eq 'Jumpgate'){
-			while ($file =~ m/(\d+):(\d+):(\d+)\D+"left"\>(Attack|Defend|Return)<\/td><td>([^<]*)<\/td><td>(\d+)\D+(\d+)/g){
+		#print "$file\n";
+			while ($file =~ m{(\d+):(\d+):(\d+)\D+(Attack|Defend|Return)</td><td class="left">([^<]*)\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');