Change database structure for planets and alliances + PG 8.4 changes

[ndwebbie.git] / lib / NDWeb / Include.pm

diff --git a/lib/NDWeb/Include.pm b/lib/NDWeb/Include.pm
index b092122dba84be1d849797ad7f51b8db6bdbbab1..1cbcca9de3e09790280105192f16df6345ab1f2d 100644 (file)
--- a/lib/NDWeb/Include.pm
+++ b/lib/NDWeb/Include.pm
@@ -81,9 +81,9 @@ sub intelquery {
        return qq{
 SELECT $columns, i.mission, i.tick AS landingtick,MIN(i.eta) AS eta, i.amount, i.ingal, u.username
 FROM (intel i NATURAL JOIN users u)
-       JOIN current_planet_stats t ON i.target = t.id
-       JOIN current_planet_stats o ON i.sender = o.id
-WHERE $where 
+       JOIN current_planet_stats t ON i.target = t.pid
+       JOIN current_planet_stats o ON i.sender = o.pid
+WHERE $where
 GROUP BY i.tick,i.mission,t.x,t.y,t.z,o.x,o.y,o.z,i.amount,i.ingal,u.username,t.alliance,o.alliance,t.nick,o.nick,i.sender,i.target
 ORDER BY i.tick DESC, i.mission};
 }