X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=525c969c9d42c8876200491b1813909415900438;hb=0000c72e6700ef1af5dd4ef608d6a9f00b30442d;hp=8342960551e553c590a965c502bdf587fcea3085;hpb=36a13cae169413fc04fbf704d94a2ad797336e6e;p=ndwebbie.git

diff --git a/scripts/scans.pl b/scripts/scans.pl
index 8342960..525c969 100755
--- a/scripts/scans.pl
+++ b/scripts/scans.pl
@@ -23,6 +23,7 @@ use strict;
 use warnings;
 no warnings 'exiting';
 use local::lib;
+use Sys::RunAlone;
 use CGI;
 use DBI;
 use DBD::Pg qw(:pg_types);
@@ -34,6 +35,7 @@ use FindBin;
 use lib "$FindBin::Bin/../lib";
 
 use ND::DB;
+use NDWeb::Scans;
 
 our $dbh = ND::DB::DB();
 
@@ -41,7 +43,6 @@ our $dbh = ND::DB::DB();
 
 #my $test = $dbh->prepare(q{INSERT INTO scans (tick,scan_id) VALUES(1,3) RETURNING id});
 #print ;
-$dbh->do(q{SET CLIENT_ENCODING TO 'LATIN1';});
 
 my $scangroups = $dbh->prepare(q{SELECT id,scan_id,tick,uid FROM scans
 	WHERE groupscan AND NOT parsed FOR UPDATE
@@ -143,11 +144,17 @@ sub parse_jumpgate {
 
 }
 
+sub parse_military {
+	my ($scan,$file) = @_;
+
+	doMilScan($dbh, $scan, $file);
+}
+
 my $adddevscan = $dbh->prepare(q{INSERT INTO development_scans
 	(id,tick,pid,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(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+		,metal_ref,crystal_ref,eonium_ref,reslabs,fincents,milcents,seccents,structdefs
+		,travel,infra,hulls,waves,extraction,covert,mining,population,total)
+	VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 	});
 
 
@@ -157,6 +164,7 @@ my %parsers = (
 	Unit => \&parse_unit,
 	'Advanced Unit' => \&parse_unit,
 	Jumpgate => \&parse_jumpgate,
+	Military => \&parse_military,
 );
 
 
@@ -207,26 +215,26 @@ while (my $scan = $newscans->fetchrow_hashref){
 		if (exists $parsers{$type}){
 			$parsers{$type}->($scan,$file);
 		}elsif ($type eq 'News'){
-			while( $file =~ m{top">((?:\w| )+)\D+(\d+)</td><td class="left" valign="top">(.+?)</td></tr>}g){
+			while( $file =~ m{top;">((?:\w| )+)\D+(\d+)</td><td class="left" style="vertical-align: top;">(.+?)</td></tr>}g){
 				my $news = $1;
 				my $t = $2;
 				my $text = $3;
 				my ($x,$y,$z) = $dbh->selectrow_array($findcoords,undef,$planet,$t);
 				die "No coords for: $planet tick $t" unless defined $x;
-				if($news eq 'Launch' && $text =~ m{The (.*?) fleet has been launched, heading for <a class="coords" href="galaxy.pl\?x=\d+&amp;y=\d+">(\d+):(\d+):(\d+)</a>, on a mission to (Attack|Defend). Arrival tick: (\d+)}g){
+				if(($news eq 'Defend' || $news eq 'Attack' || $news eq 'Launch') && $text =~ m{The (.*?) fleet has been launched, heading for <a class="coords" href="galaxy.pl\?x=\d+&amp;y=\d+">(\d+):(\d+):(\d+)</a>, on a mission to (Attack|Defend). Arrival tick: (\d+)}g){
 					my $eta = $6 - $t;
 					my $mission = $5;
 					my $back = $6 + $eta;
 					$mission = 'AllyDef' if $eta == 6 && $x != $2;
 					my ($target) = $dbh->selectrow_array($findplanet,undef
 						,$2,$3,$4,$t) or die $dbh->errstr;
-					die "No target: $2:$3:$4" unless defined $target;
+					next unless defined $target;
 					my $id = addintel($1,$mission,$planet,$target,$6
 						,$eta,$back,undef, ($x == $2 && $y == $3));
 					$intelscan->execute($id,$scan->{id});
-				}elsif($news eq 'Incoming' && $text =~ m{We have detected an open jumpgate from (.*?), located at <a class="coords" href="galaxy.pl\?x=\d+&amp;y=\d+">(\d+):(\d+):(\d+)</a>. The fleet will approach our system in tick (\d+) and appears to have (\d+) visible ships}g){
+				}elsif($news eq 'Hostile' && $text =~ m{We have detected an open jumpgate from (.*?), located at <a class="coords" href="galaxy.pl\?x=\d+&amp;y=\d+">(\d+):(\d+):(\d+)</a>. The fleet will approach our system in tick (\d+) and appears to have (\d+) visible ships}g){
 					my $eta = $5 - $t;
-					my $mission = '';
+					my $mission = 'Attack';
 					my $back = $5 + $eta;
 					$mission = 'Defend' if $eta <= 6;
 					$mission = 'AllyDef' if $eta == 6 && $x != $2;
@@ -243,7 +251,7 @@ while (my $scan = $newscans->fetchrow_hashref){
 			my $total = 0;
 			while($file =~ m{((?:[a-zA-Z]| )+)</t[dh]><td(?: class="right")?>(\d+)}sg){
 				push @values,$2;
-				$total += $2 if $#values <= 13;
+				$total += $2 if $#values <= 15;
 			}
 			push @values,$total;
 			$adddevscan->execute(@values);
@@ -307,3 +315,5 @@ sub addintel {
 		,$target,$tick, $eta, $back, $amount,$ingal);
 	return $id;
 }
+
+__END__