X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=200e33f4e8a8d4c59f32b378b505322cf0af962b;hb=c9c885f1465519d76dc5dd83500f8c538494faf8;hp=b54cb54f81fbc83eb5efca351cb83e3ccc78ee92;hpb=833b02ec09d59a4968de6c3117e29654e5edca4b;p=ndwebbie.git

diff --git a/scripts/scans.pl b/scripts/scans.pl
index b54cb54..200e33f 100755
--- a/scripts/scans.pl
+++ b/scripts/scans.pl
@@ -35,6 +35,7 @@ use FindBin;
 use lib "$FindBin::Bin/../lib";
 
 use ND::DB;
+use NDWeb::Scans;
 
 our $dbh = ND::DB::DB();
 
@@ -84,31 +85,11 @@ my $addintel = $dbh->prepare(q{INSERT INTO intel (name,mission,sender,target,tic
 	VALUES(?,?,?,?,?,?,?,?,?,-1) RETURNING id});
 my $intelscan = $dbh->prepare(q{INSERT INTO intel_scans (intel,id) VALUES(?,?)});
 my $addships = $dbh->prepare(q{INSERT INTO fleet_ships (fid,ship,amount) VALUES(?,?,?)});
-my $addplanetscan = $dbh->prepare(q{INSERT INTO planet_scans
-	(id,tick,pid,metal_roids,metal,crystal_roids,crystal,eonium_roids,eonium
-		,agents,guards,light,medium,heavy,hidden)
-	VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)});
 
 sub parse_planet {
 	my ($scan,$file) = @_;
 
-	my @values = ($scan->{id},$scan->{tick},$scan->{pid});
-	$file =~ s/(\d),(\d)/$1$2/g;
-
-	while($file =~ m{"center">(Metal|Crystal|Eonium)</td>\D+(\d+)\D+([\d,]+)}g){
-		push @values,$2,$3;
-	}
-	if($file =~ m{Security\ Guards .+? "center">(\d+)</td>
-			.+? "center">(\d+)</td>}sx){
-		push @values,$1,$2;
-	}
-	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>}){
-		push @values,$1,$2,$3;
-	}
-	if($file =~ m{<span class="superhighlight">([\d,]+)</span>}){
-		push @values,$1;
-	}
-	$addplanetscan->execute(@values);
+	doPlanetScan($dbh, $scan, $file);
 }
 
 sub parse_incoming {
@@ -143,6 +124,12 @@ 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,milcents,seccents,structdefs
@@ -157,6 +144,7 @@ my %parsers = (
 	Unit => \&parse_unit,
 	'Advanced Unit' => \&parse_unit,
 	Jumpgate => \&parse_jumpgate,
+	Military => \&parse_military,
 );