X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=096d175bc015fdd6613cf43eea66c3f0f2f97da1;hb=677178daefe481e0144a2fc08ee2744839b450ad;hp=a7c25dd8896768de8bd755f7e85b58757f36a2f2;hpb=d7a5e063f25a05b4b8c2c6ce12294d488f5f24cd;p=ndwebbie.git diff --git a/scripts/scans.pl b/scripts/scans.pl index a7c25dd..096d175 100755 --- a/scripts/scans.pl +++ b/scripts/scans.pl @@ -45,7 +45,7 @@ my $scangroups = $dbh->prepare(q{SELECT id,scan_id,tick,uid FROM scans }); my $oldscan = $dbh->prepare(q{SELECT scan_id FROM scans WHERE scan_id = LOWER(?) AND tick >= tick() - 168}); my $addScan = $dbh->prepare(q{INSERT INTO scans (scan_id,tick,uid) VALUES (LOWER(?),?,?)}); -my $parsedscan = $dbh->prepare(q{UPDATE scans SET tick = ?, type = ?, planet = ?, parsed = TRUE WHERE id = ?}); +my $parsedscan = $dbh->prepare(q{UPDATE scans SET tick = ?, type = ?, pid = ?, parsed = TRUE WHERE id = ?}); my $addpoints = $dbh->prepare(q{UPDATE users SET scan_points = scan_points + ? WHERE uid = ? }); my $delscan = $dbh->prepare(q{DELETE FROM scans WHERE id = ?}); @@ -73,23 +73,23 @@ my $newscans = $dbh->prepare(q{SELECT id,scan_id,tick,uid FROM scans WHERE NOT groupscan AND NOT parsed FOR UPDATE }); my $findplanet = $dbh->prepare(q{SELECT planetid(?,?,?,?)}); -my $findoldplanet = $dbh->prepare(q{SELECT id FROM planet_stats WHERE x = $1 AND y = $2 AND z = $3 AND tick <= $4 ORDER BY tick DESC LIMIT 1}); +my $findoldplanet = $dbh->prepare(q{SELECT pid FROM planet_stats WHERE x = $1 AND y = $2 AND z = $3 AND tick <= $4 ORDER BY tick DESC LIMIT 1}); my $findcoords = $dbh->prepare(q{SELECT * FROM planetcoords(?,?)}); -my $addfleet = $dbh->prepare(q{INSERT INTO fleets (name,mission,planet,tick,amount) VALUES(?,?,?,?,?) RETURNING fid}); +my $addfleet = $dbh->prepare(q{INSERT INTO fleets (name,mission,pid,tick,amount) VALUES(?,?,?,?,?) RETURNING fid}); my $fleetscan = $dbh->prepare(q{INSERT INTO fleet_scans (fid,id) VALUES(?,?)}); my $addintel = $dbh->prepare(q{INSERT INTO intel (name,mission,sender,target,tick,eta,back,amount,ingal,uid) 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,planet,metal_roids,metal,crystal_roids,crystal,eonium_roids,eonium + (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->{planet}); + 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){ @@ -113,7 +113,7 @@ sub parse_incoming { while($file =~ m{class="left">Fleet:\s(.*?)