Update to new database structure

[NDIRC.git] / Commands / Scans.pm

diff --git a/Commands/Scans.pm b/Commands/Scans.pm
index ed0def8dc5af3bd3adfafe4c23497ac377b41ea2..31eea44fb9f940800b58132568c4d9cfc673f0a2 100644 (file)
--- a/Commands/Scans.pm
+++ b/Commands/Scans.pm
@@ -61,7 +61,7 @@ sub gs
 
        my $query = $c->model->prepare(q{SELECT scan_id
                FROM scans
-               WHERE planet = $1 AND type = $2 AND tick >= tick()});
+               WHERE pid = $1 AND type = $2 AND tick >= tick()});
        $query->execute($planet,$type);
 
        if (my $scan = $query->fetchrow_hashref){
@@ -71,7 +71,7 @@ sub gs
                my $req = $c->model->prepare(q{
 SELECT * FROM scan_requests
 WHERE uid = (SELECT uid FROM users WHERE hostmask ILIKE $1)
-       AND planet = $2 AND type = $3 AND NOT sent
+       AND pid = $2 AND type = $3 AND NOT sent
                });
                $req->execute($c->host,$planet,$type);
 
@@ -85,7 +85,7 @@ WHERE id = $2
                        $id = $scan->{id};
                }else{
                        $req = $c->model->prepare(q{
-INSERT INTO scan_requests (uid,nick,planet,type)
+INSERT INTO scan_requests (uid,nick,pid,type)
 VALUES((SELECT uid FROM users WHERE hostmask ILIKE $1),$2,$3,$4) RETURNING (id)
                        });
                        $req->execute($c->host,$c->nick,$planet,$type);
@@ -128,10 +128,10 @@ sub scanreqs
        my $reqs = $c->model->prepare(q{
 SELECT min(sr.id) AS id, x,y,z,type
 FROM scan_requests sr
-       JOIN current_planet_stats p ON p.id = sr.planet
+       JOIN current_planet_stats p USING (pid)
 WHERE sr.time > NOW() - '30 min'::INTERVAL
        AND NOT EXISTS (SELECT scan_id FROM scans
-               WHERE planet = sr.planet
+               WHERE pid = sr.pid
                        AND type = sr.type
                        AND tick >= sr.tick
        )
@@ -161,7 +161,7 @@ sub scan
 
        my $scan = $c->model->selectrow_hashref(q{
 SELECT id, scan_id, tick FROM scans
-WHERE type = $1 AND planet = planetid($2,$3,$4,0) AND COALESCE(tick < $5,TRUE)
+WHERE type = $1 AND pid = planetid($2,$3,$4,0) AND COALESCE(tick < $5,TRUE)
 ORDER BY tick DESC LIMIT 1
                        },undef,$type,$x,$y,$z,$tick);
        unless ($scan->{id}){