-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 $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 $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(?,?,?)});
+
+sub parse_planet {
+ my ($scan,$file) = @_;
+
+ doPlanetScan($dbh, $scan, $file);
+}
+
+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;
+ }
+}
+
+sub parse_unit {
+ my ($scan,$file) = @_;
+
+ my $id = addfleet($scan->{type},'Full fleet',$file,$scan->{pid},$scan->{tick});
+ $fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
+}
+
+sub parse_jumpgate {
+ my ($scan,$file) = @_;
+
+ $file =~ s/,//g;
+ while ($file =~ m{(\d+):(\d+):(\d+)\D+(Attack|Defend|Return)</td><td class="left">([^<]*)\D+(\d+)\D+(\d+)}g){
+ my ($sender) = $dbh->selectrow_array($findplanet,undef,$1,$2,$3,$scan->{tick});
+ ($sender) = $dbh->selectrow_array($findoldplanet,undef,$1,$2,$3,$scan->{tick})
+ if ((not defined $sender) && $4 eq 'Return');
+ my $id = addintel($5,$4,$sender,$scan->{pid},$scan->{tick}+$6,$6
+ ,undef,$7, $scan->{x} == $1 && $scan->{y} == $2);
+ $intelscan->execute($id,$scan->{id});
+ }
+
+}
+
+sub parse_military {
+ my ($scan,$file) = @_;
+
+ doMilScan($dbh, $scan, $file);
+}
+