X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=525c969c9d42c8876200491b1813909415900438;hb=0000c72e6700ef1af5dd4ef608d6a9f00b30442d;hp=f6b6be316d14debf006acaf3f34a05d67e50fe5b;hpb=61e15c2461ecf6e921f4239c28134fe01b1aba10;p=ndwebbie.git diff --git a/scripts/scans.pl b/scripts/scans.pl index f6b6be3..525c969 100755 --- a/scripts/scans.pl +++ b/scripts/scans.pl @@ -22,15 +22,20 @@ use strict; use warnings; no warnings 'exiting'; +use local::lib; +use Sys::RunAlone; use CGI; use DBI; use DBD::Pg qw(:pg_types); -use LWP::Simple; + +use LWP::Simple qw/get $ua/; +$ua->agent("Stupid user agent check is stupid"); use FindBin; use lib "$FindBin::Bin/../lib"; use ND::DB; +use NDWeb::Scans; our $dbh = ND::DB::DB(); @@ -38,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 @@ -140,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(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) }); @@ -154,6 +164,7 @@ my %parsers = ( Unit => \&parse_unit, 'Advanced Unit' => \&parse_unit, Jumpgate => \&parse_jumpgate, + Military => \&parse_military, ); @@ -204,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+)