not max 60 ppl avg anymore

[ndwebbie.git] / ND / Web / Pages / Raids.pm

diff --git a/ND/Web/Pages/Raids.pm b/ND/Web/Pages/Raids.pm
index 65aa7e9a2ded6cce9f029d7f32947b62e8c6743e..eddd7c8935e7de626374bf4b606d12d98321470d 100644 (file)
--- a/ND/Web/Pages/Raids.pm
+++ b/ND/Web/Pages/Raids.pm
@@ -178,7 +178,7 @@ sub render_body {
                return $self->generateClaimXml($BODY,$raid,$from);
        }
        if ($self->{XML} && param('cmd') eq 'gettargets' ){
-               $_ = listTargets();
+               $_ = $self->listTargets();
                $BODY->param(TargetList => $_);
        }
 
@@ -224,7 +224,7 @@ sub render_body {
                        $target{comment} = parseMarkup($target->{comment}) if ($target->{comment});
 
                        my $scans = $DBH->prepare(q{SELECT DISTINCT ON (type) type, tick, scan FROM scans 
-                               WHERE planet = ? AND type ~ 'Unit|Planet|Military|.* Analysis' AND tick + 24 > tick() AND scan is not null
+                               WHERE planet = ? AND type ~ 'Unit|Planet|Advanced Unit|.* Analysis' AND tick + 24 > tick() AND scan is not null
                                GROUP BY type, tick, scan ORDER BY type ,tick DESC});
                        $scans->execute($target->{planet});
                        my %scans;
@@ -233,7 +233,7 @@ sub render_body {
                        }
 
                        my @scans;
-                       for my $type ('Planet','Unit','Military','Surface Analysis','Technology Analysis'){
+                       for my $type ('Planet','Unit','Advanced Unit','Surface Analysis','Technology Analysis'){
                                next unless exists $scans{$type};
                                my $scan = $scans{$type};
                                if ($self->{TICK} - $scan->{tick} > 5){