Use new race infrastructure for members stats

[ndwebbie.git] / scripts / scans.pl

diff --git a/scripts/scans.pl b/scripts/scans.pl
index 40957a77f7eb8555d342854680f4920b8b96568e..89dd92c787f18424fc2fe7d7994c0d2aa4aa55aa 100755 (executable)
--- 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
@@ -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 {
@@ -132,7 +113,7 @@ sub parse_jumpgate {
        my ($scan,$file) = @_;
 
        $file =~ s/,//g;
-       while ($file =~ m{(\d+):(\d+):(\d+)\D+(Attack|Defend|Return)</td><td class="left">([^<]*)\D+(\d+)\D+(\d+)}g){
+       while ($file =~ m{(\d+):(\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,$scan->{tick});
                ($sender) = $dbh->selectrow_array($findoldplanet,undef,$1,$2,$3,$scan->{tick})
                        if ((not defined $sender) && $4 eq 'Return');
@@ -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,
 );
 
 
@@ -307,3 +295,5 @@ sub addintel {
                ,$target,$tick, $eta, $back, $amount,$ingal);
        return $id;
 }
+
+__END__