New structure for planet, surface and tech scans

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

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index 205e1056fb8485ec35e3cc4f67af3877a04edd71..ba56fa88c8509899ae96af4c382dee056d045bf7 100644 (file)
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -109,17 +109,17 @@ sub view : Local {
        $c->stash(landingtick => $raid->{tick});
        my $targetquery = $dbh->prepare(qq{SELECT r.id, r.planet, size, score, value
                , p.x,p.y,p.z, race
-               , p.value - p.size*200 - 
-                       COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150 - 
+               , 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
                ,(metal+crystal+eonium)/100 AS resvalue, comment
                , hidden, light, medium, heavy
-               FROM current_planet_stats p 
-               JOIN raid_targets r ON p.id = r.planet 
-               LEFT OUTER JOIN planet_scans ps ON p.id = ps.planet
-               LEFT OUTER JOIN structure_scans ss ON p.id = ss.planet
+               FROM current_planet_stats p
+               JOIN raid_targets r ON p.id = r.planet
+               LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet
+               LEFT OUTER JOIN current_structure_scans ss ON p.id = ss.planet
                WHERE r.raid = ?
                $noingal
                ORDER BY size});
@@ -248,9 +248,9 @@ sub edit : Local {
        $c->stash(removegroups => \@remgroups);
        $c->stash(addgroups => \@addgroups);
 
-       if ($order =~ /^(score|size|value|xp)rank$/){
+       if ($order && $order =~ /^(score|size|value|xp)rank$/){
                $order .= " ASC";
-       }elsif ($order eq 'race'){
+       }elsif ($order && $order eq 'race'){
                $order .= ' ASC';
        }else {
                $order .= 'p.x,p.y,p.z';
@@ -534,11 +534,12 @@ sub targetlist : Local {
 
        $c->stash(comma => \&comma_value);
        $c->stash(allies => $alliances);
+       $alliances ||= '';
        my @alliances = split /,/, $alliances;
 
        $c->forward('listAlliances');
 
-       if ($order =~ /^(sizerank|valuerank|scorerank|xprank|nfvalue|nfvalue2)$/){
+       if ($order && $order =~ /^(sizerank|valuerank|scorerank|xprank|nfvalue|nfvalue2)$/){
                $order = "$1";
        }else{
                $order = "nfvalue";