Planet government intel

[ndwebbie.git] / lib / NDWeb / Controller / Intel.pm

diff --git a/lib/NDWeb/Controller/Intel.pm b/lib/NDWeb/Controller/Intel.pm
index 990b2225e9f07fef9b1afc0ff028b1150f5f955a..a67674714b71fa87f133ba3fe96eb0961ba60077 100644 (file)
--- a/lib/NDWeb/Controller/Intel.pm
+++ b/lib/NDWeb/Controller/Intel.pm
@@ -80,7 +80,9 @@ sub planet : Local {
        $c->forward('/listAlliances');
        $c->forward('/forum/findPosts',[$p->{ftid}]);
 
-       $c->stash(govs => ["","Feu", "Dic", "Dem","Uni"]);
+       my $governments = $dbh->prepare(q{SELECT gov, gov_name FROM governments});
+       $governments->execute;
+       $c->stash(govs => $governments->fetchall_arrayref({}));
        $c->stash(planetstatus => ["","Friendly", "NAP", "Hostile"]);
 
        $query = $dbh->prepare(q{
@@ -269,7 +271,7 @@ sub member : Local {
        my $dbh = $c->model;
 
        my $query = $dbh->prepare(q{
-               SELECT coords(t.x,t.y,t.z), i.eta, i.tick, rt.id AS ndtarget, rc.launched, inc.landing_tick
+               SELECT coords(t.x,t.y,t.z), i.eta, i.tick, rt.id AS ndtarget, rc.launched
                FROM users u
                LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM intel WHERE amount IS NULL) i ON i.sender = u.pid
                LEFT OUTER JOIN current_planet_stats t ON i.target = t.pid
@@ -277,10 +279,6 @@ sub member : Local {
                                JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.pid = i.target
                        AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick
                LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid AND i.tick = rt.tick + rc.wave - 1
-               LEFT OUTER JOIN (SELECT pid, eta, landing_tick FROM calls c
-                                       JOIN incomings i USING (call)) inc ON inc.pid = i.target
-                               AND (inc.landing_tick + inc.eta) >= i.tick 
-                               AND (inc.landing_tick - inc.eta - 1) <= (i.tick - i.eta)
                WHERE u.uid = $1 AND i.mission = 'Attack'
                ORDER BY (i.tick - i.eta)
                });