Added page to list def channels and alliance for planets

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

diff --git a/lib/NDWeb/Controller/Intel.pm b/lib/NDWeb/Controller/Intel.pm
index 4cc3b7e4bcd6871301f069b6c26551d8da0ba35d..bbdf0f749ad461fb16fd0ffaa1101569ddf60105 100644 (file)
--- a/lib/NDWeb/Controller/Intel.pm
+++ b/lib/NDWeb/Controller/Intel.pm
@@ -2,6 +2,7 @@ package NDWeb::Controller::Intel;
 
 use strict;
 use warnings;
+use feature ':5.10';
 use parent 'Catalyst::Controller';
 
 use NDWeb::Include;
@@ -49,7 +50,7 @@ sub index :Path : Args(0) {
                while ($coords =~ m/(\d+:\d+:\d+)/g){
                        push @coords,$1;
                }
-               my $planets = $dbh->prepare(q{SELECT id,coords(x,y,z), alliance
+               my $planets = $dbh->prepare(q{SELECT id,coords(x,y,z), alliance, nick
                        FROM current_planet_stats p
                        WHERE coords(x,y,z) = ANY($1)
                        ORDER BY alliance, p.x, p.y, p.z
@@ -97,6 +98,27 @@ sub planet : Local {
 
 }
 
+sub channels : Local {
+       my ( $self, $c, $order ) = @_;
+       my $dbh = $c->model;
+
+       if ($order ~~ /(alliance|channel)/){
+               $order = "lower($1) ASC";
+       }elsif ($order ~~ /(coords)/){
+               $order = "x,y,z";
+       }else{
+               $order = 'lower(channel)';
+       }
+
+       my $query = $dbh->prepare(q{
+SELECT id,coords(x,y,z),nick,channel,alliance FROM current_planet_stats
+WHERE channel <> '' and channel IS NOT NULL
+ORDER BY } . $order
+       );
+       $query->execute;
+       $c->stash(planets => $query->fetchall_arrayref({}) );
+}
+
 sub postplanetcomment : Local {
        my ($self, $c, $p) = @_;
 
@@ -159,11 +181,24 @@ sub find : Local {
        my $dbh = $c->model;
 
        local $_ = $find || $c->req->param('coords');
+       $c->stash(searchterm => $_);
 
        if (/(\d+)(?: |:)(\d+)(?: |:)(\d+)(?:(?: |:)(\d+))?/){
                my $planet = $dbh->selectrow_array(q{SELECT planetid($1,$2,$3,$4)}
                        ,undef,$1,$2,$3,$4);
                $c->res->redirect($c->uri_for('planet',$planet));
+       }else{
+               my $query = $dbh->prepare(q{SELECT id,coords(x,y,z),nick
+                       FROM current_planet_stats p
+                       WHERE nick ilike $1
+               });
+               $query->execute($_);
+               my $planets = $query->fetchall_arrayref({});
+               if (@{$planets} == 1){
+                       $c->res->redirect($c->uri_for('planet',$planets->[0]->{id}));
+               }else{
+                       $c->stash(planets => $planets);
+               }
        }
 }
 
@@ -198,7 +233,7 @@ sub members : Local {
                FROM users u
                JOIN groupmembers gm USING (uid)
                LEFT OUTER JOIN (SELECT DISTINCT ON (planet) planet,tick from scans where type = 'News' ORDER BY planet,tick DESC) n USING (planet)
-               LEFT OUTER JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
+               LEFT OUTER JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
                LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
                LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r 
                                JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target 
@@ -218,7 +253,7 @@ sub member : Local {
        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
                FROM users u
-               LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
+               LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
                LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
                LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r 
                                JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target 
@@ -255,7 +290,7 @@ sub member : Local {
        $query = $dbh->prepare(q{
                SELECT coords(t.x,t.y,t.z),t.alliance_id, t.alliance, i.eta, i.tick, i.ingal
                FROM users u
-               JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
+               JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
                LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
                WHERE u.uid = $1 AND (i.mission = 'Defend' OR i.mission = 'AllyDef')
                ORDER BY (i.tick - i.eta)
@@ -289,13 +324,13 @@ sub naps : Local {
                ,ruler, p.planet,race, size, score, value
                , xp, sizerank, scorerank, valuerank, xprank, p.value - p.size*200 
                        - COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150
-                       - COALESCE(ss.total ,(SELECT COALESCE(avg(total),0)
-                               FROM structure_scans)::int)*1500 AS fleetvalue
+                       - COALESCE(ds.total ,(SELECT COALESCE(avg(total),0)
+                               FROM current_development_scans)::int)*1500 AS fleetvalue
                ,(metal+crystal+eonium)/100 AS resvalue, planet_status,hit_us
                , alliance,relationship,nick
                FROM current_planet_stats p
                        LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet
-                       LEFT OUTER JOIN current_structure_scans ss ON p.id = ss.planet
+                       LEFT OUTER JOIN current_development_scans ds ON p.id = ds.planet
                WHERE planet_status IN ('Friendly','NAP') order by x,y,z asc
                });
        $query->execute;