more fatal warnings and other cleanup

[ndwebbie.git] / raids.pl

diff --git a/raids.pl b/raids.pl
index 4480d6bff2a13ba74a3797b3532ba4d0b3b6f268..1ebaad61fb0098ff6b29d3c551cc2ea4ef1c2805 100644 (file)
--- a/raids.pl
+++ b/raids.pl
@@ -18,86 +18,20 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
 use POSIX;
 our $BODY;
 our $DBH;
 our $LOG;
 our $XML;
 
-
-sub generateClaimXml {
-       my ($raid, $from, $target) = @_;
-
-       my ($timestamp) = $DBH->selectrow_array("SELECT MAX(modified)::timestamp AS modified FROM raid_targets");
-       $BODY->param(Timestamp => $timestamp);
-       if ($target){
-               $target = "r.id = $target";
-               $_ = listTargets();
-               $BODY->param(TargetList => $_);
-       }else{
-               $target = "r.raid = $raid->{id}";
-       }
-
-       if ($from){
-               $from = "AND modified > '$from'";
-       }
-       my $targets = $DBH->prepare(qq{SELECT r.id,r.planet FROM raid_targets r WHERE $target $from});
-       $targets->execute;
-       my $claims =  $DBH->prepare(qq{ SELECT username,joinable,launched FROM raid_claims
-               NATURAL JOIN users WHERE target = ? AND wave = ?});
-       my @targets;
-       while (my $target = $targets->fetchrow_hashref){
-               my %target;
-               $target{Id} = $target->{id};
-               $target{Coords} = $target->{id};
-               my @waves;
-               for (my $i = 1; $i <= $raid->{waves}; $i++){
-                       my %wave;
-                       $wave{Id} = $i;
-                       $claims->execute($target->{id},$i);
-                       my $joinable = 0;
-                       my $claimers;
-                       if ($claims->rows != 0){
-                               my $owner = 0;
-                               my @claimers;
-                               while (my $claim = $claims->fetchrow_hashref){
-                                       $owner = 1 if ($ND::USER eq $claim->{username});
-                                       $joinable = 1 if ($claim->{joinable});
-                                       $claim->{username} .= '*' if ($claim->{launched});
-                                       push @claimers,$claim->{username};
-                               }
-                               $claimers = join '/', @claimers;
-                               if ($owner){
-                                       $wave{Command} = 'Unclaim';
-                                       if ($raid->{released_coords}){
-                                               $target{Coords} = $DBH->selectrow_array('SELECT coords(x,y,z) FROM current_planet_stats WHERE id = ?',undef,$target->{planet});
-                                       }
-                               }elsif ($joinable){
-                                       $wave{Command} = 'Join';
-                               }else{
-                                       $wave{Command} = 'none';
-                               }
-                       }else{
-                               #if (!isset($planet) || ($target->value/$planet->value > 0.4 || $target->score/$planet->score > 0.4))
-                               $wave{Command} = 'Claim';
-                       }
-                       $wave{Claimers} = $claimers;
-                       $wave{Joinable} = $joinable;
-                       push @waves,\%wave;
-               }
-               $target{Waves} = \@waves;
-               push @targets,\%target;
-       }
-       $BODY->param(Targets => \@targets);
-}
-
 my $raid;
-if (param('raid') =~ /^(\d+)$/){
+if (defined param('raid')){
        my $query = $DBH->prepare(q{SELECT id,tick,waves,message,released_coords FROM raids WHERE id = ? AND open AND not removed AND id IN (SELECT raid FROM raid_access NATURAL JOIN groupmembers WHERE uid = ?)});
-       $raid = $DBH->selectrow_hashref($query,undef,$1,$ND::UID);
+       $raid = $DBH->selectrow_hashref($query,undef,param('raid'),$ND::UID);
 }
 
-if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
+if (defined param('cmd') && defined param('target') && defined param('wave') && param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
        my $target = param('target');
        my $wave = param('wave');
        
@@ -130,7 +64,7 @@ if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
                        }
                }
        }
-       if (param('joinable') =~ /(TRUE|FALSE)/){
+       if (param('cmd') eq 'set' && defined param('joinable') && param('joinable') =~ /(TRUE|FALSE)/){
                my $claims = $DBH->prepare(qq{SELECT username FROM raid_claims NATURAL JOIN users WHERE target = ? AND wave = ? AND uid = ?});
                $claims->execute($target,$wave,$ND::UID);
                if ($claims->rows != 0){
@@ -197,8 +131,10 @@ ORDER BY size});
                        $target{Size} = floor($target->{size}/$num)*$num;
                        $num = pow(10,length($target->{fleetvalue})-2);
                        $target{FleetValue} = floor($target->{fleetvalue}/$num)*$num;
-                       $num = pow(10,length($target->{resvalue})-2);
-                       $target{ResValue} = floor($target->{resvalue}/$num)*$num;
+                       if (defined $target->{resvalue}){
+                               $num = pow(10,length($target->{resvalue})-2);
+                               $target{ResValue} = floor($target->{resvalue}/$num)*$num;
+                       }
                        $target{comment} = parseMarkup($target->{comment}) if ($target->{comment});
 
                        my $scans = $DBH->prepare(q{SELECT DISTINCT ON (type) type, tick, scan FROM scans