X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fscans.pl;h=dc5b575681b790e32fae97c417c2d86e595d9eb2;hb=bb6ade01b9d1665e3dbb03a8fb9e16152be1a338;hp=999ba864509ca4c8e1ba26b8171707a0b51a9068;hpb=f0bf7599836c6acd50c28dda0dcc57f62be84a1b;p=ndwebbie.git

diff --git a/scripts/scans.pl b/scripts/scans.pl
index 999ba86..dc5b575 100755
--- a/scripts/scans.pl
+++ b/scripts/scans.pl
@@ -38,7 +38,7 @@ $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});
 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 (?,?,COALESCE(?,'-1'))});
+my $addScan = $dbh->prepare(q{INSERT INTO scans (scan_id,tick,uid) VALUES (?,?,?)});
 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 = ?});
@@ -67,8 +67,7 @@ my $findcoords = $dbh->prepare(q{SELECT * FROM planetcoords(?,?)});
 my $addfleet = $dbh->prepare(q{INSERT INTO fleets (name,mission,sender,target,tick,eta,back,amount,ingal,uid) VALUES(?,?,?,?,?,?,?,?,?,-1) RETURNING id});
 my $fleetscan = $dbh->prepare(q{INSERT INTO fleet_scans (id,scan) VALUES(?,?)});
 my $addships = $dbh->prepare(q{INSERT INTO fleet_ships (id,ship,amount) VALUES(?,?,?)});
-my $addpdata = $dbh->prepare(q{INSERT INTO planet_data (planet,tick,rid,amount,uid) VALUES(?,?,(SELECT id FROM planet_data_types WHERE category = ? AND name = ?), ?,-1) RETURNING id});
-my $pdatascan = $dbh->prepare(q{INSERT INTO data_scans (id,scan) VALUES(?,?)});
+my $addpdata = $dbh->prepare(q{INSERT INTO planet_data (id,tick,scan,rid,amount) VALUES(?,?,?,(SELECT id FROM planet_data_types WHERE category = ? AND name = ?), ?)});
 
 $newscans->execute or die $dbh->errstr;
 while (my $scan = $newscans->fetchrow_hashref){
@@ -101,18 +100,16 @@ while (my $scan = $newscans->fetchrow_hashref){
 		if ($type eq 'Planet'){
 			$file =~ s/(\d),(\d)/$1$2/g;
 			while($file =~ m/(Metal|Crystal|Eonium)\D+(\d+)\D+(\d+)/g){
-				my $id = $dbh->selectrow_array($addpdata,undef,$planet,$tick
+				$addpdata->execute($planet,$tick,$scan->{id}
 					,'roid',$1, $2) or die $dbh->errstr;
-				$pdatascan->execute($id,$scan->{id});
-				$id = $dbh->selectrow_array($addpdata,undef,$planet,$tick
+				$addpdata->execute($planet,$tick,$scan->{id}
 					,'resource',$1, $3) or die $dbh->errstr;
-				$pdatascan->execute($id,$scan->{id});
 			}
 		}elsif ($type eq 'Jumpgate'){
 			while ($file =~ m/(\d+):(\d+):(\d+)\D+"left"\>(Attack|Defend|Return)<\/td><td>([^<]*)<\/td><td>(\d+)\D+(\d+)/g){
 				
 				my ($sender) = $dbh->selectrow_array($findplanet,undef,$1,$2,$3,$tick) or die $dbh->errstr;
-				my $id = addfleet($5,$4,"",$sender,$planet,$tick+$6,$6
+				my $id = addfleet($5,$4,undef,$sender,$planet,$tick+$6,$6
 					,undef,$7, $x == $1 && $y == $2);
 				$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
 			}
@@ -131,7 +128,7 @@ while (my $scan = $newscans->fetchrow_hashref){
 					my ($target) = $dbh->selectrow_array($findplanet,undef
 						,$2,$3,$4,$t) or die $dbh->errstr;
 					die "No target: $2:$3:$4" unless defined $target;
-					my $id = addfleet($1,$mission,"",$planet,$target,$6
+					my $id = addfleet($1,$mission,undef,$planet,$target,$6
 						,$eta,$back,undef, ($x == $2 && $y == $3));
 					$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
 				}elsif($news eq 'Incoming' && $text =~ m/We have detected an open jumpgate from (.*?), located at (\d+):(\d+):(\d+). The fleet will approach our system in tick (\d+) and appears to have roughly (\d+) ships/g){
@@ -143,7 +140,7 @@ while (my $scan = $newscans->fetchrow_hashref){
 					my ($target) = $dbh->selectrow_array($findplanet,undef
 						,$2,$3,$4,$t) or die $dbh->errstr;
 					die "No target: $2:$3:$4" unless defined $target;
-					my $id = addfleet($1,$mission,"",$planet,$target,$5
+					my $id = addfleet($1,$mission,undef,$target,$planet,$5
 						,$eta,$back,$6, ($x == $2 && $y == $3));
 					$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
 				}
@@ -151,9 +148,8 @@ while (my $scan = $newscans->fetchrow_hashref){
 		} elsif($type eq 'Surface Analysis' || $type eq 'Technology Analysis'){
 			my $cat = ($type eq 'Surface Analysis' ? 'struc' : 'tech');
 			while($file =~ m{((?:[a-zA-Z]| )+)</t[dh]><td(?: class="right")?>(\d+)}sg){
-				my $id = $dbh->selectrow_array($addpdata,undef,$planet,$tick
+				$addpdata->execute($planet,$tick,$scan->{id}
 					,$cat,$1, $2) or die $dbh->errstr;
-				$pdatascan->execute($id,$scan->{id});
 			}
 
 		} elsif($type eq 'Unit' || $type eq 'Advanced Unit'){
@@ -194,13 +190,12 @@ sub addfleet {
 	}
 
 	my @ships;
-	my $total = undef;
-	while($ships =~ m{((?:[a-zA-Z]| )+)</td><td>(\d+)}sg){
-		$total = 0 unless defined $total;
+	my $total = 0;
+	while(defined $ships && $ships =~ m{((?:[a-zA-Z]| )+)</td><td>(\d+)}sg){
 		$total += $2;
 		push @ships, [$1,$2];
 	}
-	$amount = $total unless defined $amount;
+	$amount = $total if (!defined $amount) && defined $ships;
 	my $id = $dbh->selectrow_array($addfleet,undef,$name,$mission,$sender
 		,$target,$tick, $eta, $back, $amount,$ingal) or die $dbh->errstr;
 	for my $s (@ships){