remove debug output, and truncate the target size

[ndwebbie.git] / ND / Web / XMLPage.pm

diff --git a/ND/Web/XMLPage.pm b/ND/Web/XMLPage.pm
index 0868ce1d829f33d16dead9b6bf25501eb28d713a..9e5fce64f846f32f6e11e25a370ca3509bf31d84 100644 (file)
--- a/ND/Web/XMLPage.pm
+++ b/ND/Web/XMLPage.pm
@@ -39,7 +39,8 @@ sub process : method {
 sub listTargets () : method {
        my $self = shift;
        my $DBH = $self->{DBH};
-       my $query = $DBH->prepare(qq{SELECT t.id, r.id AS raid, r.tick+c.wave-1 AS landingtick, released_coords, coords(x,y,z),c.launched,c.wave,c.joinable
+       my $query = $DBH->prepare(qq{SELECT t.id, r.id AS raid, r.tick+c.wave-1 AS landingtick, 
+               (released_coords AND old_claim(timestamp)) AS released_coords, coords(x,y,z),c.launched,c.wave,c.joinable
 FROM raid_claims c
        JOIN raid_targets t ON c.target = t.id
        JOIN raids r ON t.raid = r.id
@@ -116,7 +117,7 @@ sub render : method {
                $template->param(isHC => $self->isHC);
                $template->param(isDC => $self->isDC());
                $template->param(isBC => $self->isBC());
-               $template->param(isIntel => $self->isBC());
+               $template->param(isIntel => $self->isIntel());
                $template->param(isAttacker => $ATTACKER && (!$self->isMember() || ((($TICK - $fleetupdate < 24) || $self->isScanner()) && $self->{PLANET})));
                if ($ATTACKER && (!$self->isMember() || ((($TICK - $fleetupdate < 24) || $self->isScanner()) && $self->{PLANET}))){
                        $template->param(Targets => $self->listTargets);