X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=7f80125552b0c40481de3077b69f7044252cd937;hb=44fbe786d3049f2999a288e27bd26a13cfee86b2;hp=c6d8fca2e76f22cf6c1eb25014e551fe76d92513;hpb=436af6a696e3488f5d25e027553ec356da4cde01;p=ndwebbie.git diff --git a/scripts/scans.pl b/scripts/scans.pl index c6d8fca..7f80125 100755 --- a/scripts/scans.pl +++ b/scripts/scans.pl @@ -26,7 +26,10 @@ use CGI; use DBI; use DBD::Pg qw(:pg_types); use LWP::Simple; -use lib qw{/var/www/ndawn/lib/}; + +use FindBin; +use lib "$FindBin::Bin/../lib"; + use ND::DB; our $dbh = ND::DB::DB(); @@ -77,20 +80,19 @@ my $addplanetscan = $dbh->prepare(q{INSERT INTO planet_scans (id,tick,planet,metal_roids,metal,crystal_roids,crystal,eonium_roids,eonium ,agents,guards,light,medium,heavy,hidden) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}); -my $addstrucscan = $dbh->prepare(q{INSERT INTO structure_scans +my $adddevscan = $dbh->prepare(q{INSERT INTO development_scans (id,tick,planet,light_fac,medium_fac,heavy_fac,amps,distorters - ,metal_ref,crystal_ref,eonium_ref,reslabs,fincents,seccents,total) - VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}); - -my $addtechscan = $dbh->prepare(q{INSERT INTO tech_scans - (id,tick,planet,travel,infra,hulls,waves,extraction,covert,mining) - VALUES(?,?,?,?,?,?,?,?,?,?)}); - + ,metal_ref,crystal_ref,eonium_ref,reslabs,fincents,seccents + ,travel,infra,hulls,waves,extraction,covert,mining,total) + VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + }); $dbh->begin_work or die 'No transaction'; $newscans->execute or die $dbh->errstr; $dbh->pg_savepoint('scans') or die "No savepoint"; +my $parsedscans = 0; + while (my $scan = $newscans->fetchrow_hashref){ $dbh->pg_release('scans') or die "Couldn't save"; $dbh->pg_savepoint('scans') or die "Couldn't save"; @@ -184,21 +186,15 @@ while (my $scan = $newscans->fetchrow_hashref){ $fleetscan->execute($id,$scan->{id}) or die $dbh->errstr; } } - } elsif($type eq 'Surface Analysis'){ + } elsif($type eq 'Development'){ my @values = ($scan->{id},$tick,$planet); my $total = 0; while($file =~ m{((?:[a-zA-Z]| )+)