-my $emptyscans = $dbh->prepare('SELECT scan_id,tick,"type"::integer,tick() FROM scans WHERE planet is NULL AND type ~ \'^-?[0-9]+$\'');
-my $update = $dbh->prepare('UPDATE scans SET tick = ?, "type" = ?, scan = ? , planet = ? WHERE scan_id = ? AND tick = ?');
-$addScan = $dbh->prepare('INSERT INTO scans (tick,scan_id,"type",scan,planet) VALUES($1,$2,$3,$4,$5)') or die $dbh->errstr;
-my $findplanet = $dbh->prepare('SELECT planetid(?,?,?,?)');
-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 $newscans = $dbh->prepare(q{SELECT id,scan_id,tick,uid FROM scans
+ WHERE NOT groupscan AND NOT parsed FOR UPDATE
+});
+my $findplanet = $dbh->prepare(q{SELECT planetid(?,?,?,?)});
+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 (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){
+ my $file = get("http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}");
+ next unless defined $file;