-my $delscan = $dbh->prepare('DELETE FROM scans WHERE scan_id = ? AND tick = ?');
-unless ($emptyscans->execute){
- my $cleanup = $dbh->prepare('UPDATE scans SET "type" = \'-1\' WHERE planet is NULL');
- $cleanup->execute;
- $emptyscans->execute;
-}
-while (my @scan = $emptyscans->fetchrow){
- my $file = get("http://game.planetarion.com/showscan.pl?scan_id=$scan[0]");
+my $findcoords = $dbh->prepare('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(?,?)});
+
+$newscans->execute or die $dbh->errstr;
+while (my $scan = $newscans->fetchrow_hashref){
+ my $file = get("http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}");
+ next unless defined $file;