X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=6bfdb8e8d6e1e0da4abcae09c1a34184e3cc82a3;hb=44f9fde7339f31749b2cd390738d160cc2f0c68d;hp=c7bb72483573cf50024e1617a06148e3734eebf8;hpb=7d478421939145912a4155865ad6b521e1bff08f;p=ndwebbie.git

diff --git a/scripts/scans.pl b/scripts/scans.pl
index c7bb724..6bfdb8e 100755
--- a/scripts/scans.pl
+++ b/scripts/scans.pl
@@ -43,8 +43,8 @@ $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
 });
-my $oldscan = $dbh->prepare(q{SELECT scan_id FROM scans WHERE scan_id = ? AND tick >= tick() - 168});
-my $addScan = $dbh->prepare(q{INSERT INTO scans (scan_id,tick,uid) VALUES (?,?,?)});
+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 $addpoints = $dbh->prepare(q{UPDATE users SET scan_points = scan_points + ? WHERE uid = ? });
 my $delscan = $dbh->prepare(q{DELETE FROM scans WHERE id = ?});
@@ -55,15 +55,17 @@ while (my $group = $scangroups->fetchrow_hashref){
 	$dbh->begin_work;
 	my $file = get("http://game.planetarion.com/showscan.pl?scan_grp=$group->{scan_id}");
 
-	my $points = 0;
-	while ($file =~ m/showscan.pl\?scan_id=(\d+)/g){
-		unless ($dbh->selectrow_array($oldscan,undef,$1)){
-			$addScan->execute($1,$group->{tick},$group->{uid});
-			++$points;
+	if ($file){
+		my $points = 0;
+		while ($file =~ m/showscan.pl\?scan_id=(\w+)/g){
+			unless ($dbh->selectrow_array($oldscan,undef,$1)){
+				$addScan->execute($1,$group->{tick},$group->{uid});
+				++$points;
+			}
 		}
+		$addpoints->execute($points,$group->{uid});
+		$parsedscan->execute($group->{tick},'GROUP',undef,$group->{id});
 	}
-	$addpoints->execute($points,$group->{uid});
-	$parsedscan->execute($group->{tick},'GROUP',undef,$group->{id});
 	$dbh->commit;
 }
 
@@ -73,12 +75,12 @@ my $newscans = $dbh->prepare(q{SELECT id,scan_id,tick,uid FROM scans
 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 $findcoords = $dbh->prepare(q{SELECT * FROM planetcoords(?,?)});
-my $addfleet = $dbh->prepare(q{INSERT INTO fleets (name,mission,planet,amount) VALUES(?,?,?,?) RETURNING fid});
+my $addfleet = $dbh->prepare(q{INSERT INTO fleets (name,mission,planet,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 fleet_scans (intel,id) VALUES(?,?)});
-my $addships = $dbh->prepare(q{INSERT INTO fleet_ships (id,ship,amount) VALUES(?,?,?)});
+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
 		,agents,guards,light,medium,heavy,hidden)