X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=b54cb54f81fbc83eb5efca351cb83e3ccc78ee92;hb=HEAD;hp=bda5b8ee2e438816dc76d54c4e239ec26ef4f865;hpb=bc80ba52213f39f816c5c196a9382482a40047ef;p=ndwebbie.git diff --git a/scripts/scans.pl b/scripts/scans.pl index bda5b8e..89dd92c 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 @@ -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)\D+(\d+)\D+([\d,]+)}g){ - push @values,$2,$3; - } - if($file =~ m{Security\ Guards .+? "center">(\d+) - .+? "center">(\d+)}sx){ - push @values,$1,$2; - } - if($file =~ m{