-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 (id,tick,scan,rid,amount) VALUES(?,?,?,(SELECT id FROM planet_data_types WHERE category = ? AND name = ?), ?)});
+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,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->{pid});
+ $file =~ s/(\d),(\d)/$1$2/g;
+
+ while($file =~ m{"center">(Metal|Crystal|Eonium)</td>\D+(\d+)\D+([\d,]+)}g){
+ push @values,$2,$3;
+ }
+ if($file =~ m{Security\ Guards .+? "center">(\d+)</td>
+ .+? "center">(\d+)</td>}sx){
+ push @values,$1,$2;
+ }
+ if($file =~ m{<td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td>}){
+ push @values,$1,$2,$3;
+ }
+ if($file =~ m{<span class="superhighlight">([\d,]+)</span>}){
+ push @values,$1;
+ }
+ $addplanetscan->execute(@values);
+}
+
+sub parse_incoming {
+ my ($scan,$file) = @_;
+
+ while($file =~ m{class="left">Fleet:\s(.*?)</td><td\sclass="right">
+ Mission:\s(\w+)</td></tr>(.*?)Total\sShips:\s(\d+)}sxg){
+ my $id = addfleet($1,$2,$3,$scan->{pid},$scan->{tick},$4);
+ $fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
+ }
+}