possible to mark planets as cov opped

[ndwebbie.git] / NDWeb / Pages / CovOp.pm

diff --git a/NDWeb/Pages/CovOp.pm b/NDWeb/Pages/CovOp.pm
index 56250ab7ae1a5631eec4d5f2e301af8e819dc0b4..ce6a417f17881bd22935a5a93070a7d142d7fa09 100644 (file)
--- a/NDWeb/Pages/CovOp.pm
+++ b/NDWeb/Pages/CovOp.pm
@@ -40,44 +40,49 @@ sub render_body {
        $self->{TITLE} = 'CovOp Targets';
        my $DBH = $self->{DBH};
 
-       return $self->noAccess unless $self->isHC;
+       return $self->noAccess unless $self->isMember;
 
-       my $show = q{AND ((planet_status IS NULL OR NOT planet_status IN ('Friendly','NAP')) AND  (relationship IS NULL OR NOT relationship IN ('Friendly','NAP')))};
+       my $show = q{AND (NOT planet_status IN ('Friendly','NAP')) AND  (relationship IS NULL OR NOT relationship IN ('Friendly','NAP'))};
        $show = '' if defined param('show') && param('show') eq 'all';
        if (defined param('covop') && param('covop') =~ /^(\d+)$/){
-               my $update = $DBH->prepare('UPDATE covop_targets SET covop_by = ?, last_covop = tick() WHERE planet = ? ');
+               my $update = $DBH->prepare(q{INSERT INTO covop_attacks (uid,id,tick) VALUES(?,?,tick())});
                $update->execute($ND::UID,$1);
        }
 
        my $list = '';
        my $where = '';
        if (defined param('list') && param('list') eq 'distwhores'){
-               $list = '&list=distwhores';
-               $where = qq{WHERE dists > 0 $show
-               ORDER BY dists DESC,COALESCE(sec_centres::float/structures*100,0)ASC}
+               $list = 'list=distwhores';
+               $where = qq{AND distorters > 0 $show
+               ORDER BY distorters DESC,COALESCE(seccents::float/structures*100,0)ASC}
        }else{
-               $where = qq{WHERE MaxResHack > 130000 
+               $where = qq{AND MaxResHack > 130000
                $show
-               ORDER BY COALESCE(sec_centres::float/structures*100,0) ASC,MaxResHack DESC,metal+crystal+eonium DESC};
+               ORDER BY COALESCE(seccents::float/structures*100,0) ASC,MaxResHack DESC,metal+crystal+eonium DESC};
        }
+       $BODY->param(List => $list);
 
-       my $query = $DBH->prepare(qq{SELECT id, coords, metal, crystal, eonium, sec_centres::float/structures*100 AS secs, dists, last_covop, username, MaxResHack
+       my $query = $DBH->prepare(qq{SELECT id, coords, metal, crystal, eonium
+               , seccents::float/structures*100 AS seccents, distorters
+               , MaxResHack,co.tick AS lastcovop
                FROM (SELECT p.id,coords(x,y,z), metal,crystal,eonium,
-               sec_centres,NULLIF(structures,0) AS structures,dists,last_covop,
-               u.username,max_bank_hack(metal,crystal,eonium,p.value,(SELECT value FROM
-               current_planet_stats WHERE id = ?)) AS MaxResHack, planet_status, relationship
-               FROM covop_targets c JOIN current_planet_stats p ON p.id = c.planet
-               LEFT OUTER JOIN users u ON u.uid = c.covop_by) AS foo
-               $where});
+                       seccents,NULLIF(ss.total,0) AS structures,distorters
+                       ,max_bank_hack(metal,crystal,eonium,p.value
+                               ,(SELECT value FROM current_planet_stats WHERE id = ?)) AS MaxResHack
+                       , planet_status, relationship
+                       FROM current_planet_stats p
+                               LEFT OUTER JOIN planet_scans ps ON p.id = ps.planet
+                               LEFT OUTER JOIN structure_scans ss ON p.id = ss.planet
+                       ) AS foo
+                       LEFT OUTER JOIN (SELECT id,max(tick) AS tick FROM covop_attacks GROUP BY id) co USING (id)
+               WHERE (metal IS NOT NULL OR seccents IS NOT NULL)
+               $where
+       });
        $query->execute($self->{PLANET});
 
        my @targets;
-       my $i = 0;
-       while (my ($id,$coords,$metal,$crystal,$eonium,$seccents,$dists,$lastcovop,$user,$max) = $query->fetchrow){
-               $i++;
-               push @targets,{Username => $user, Target => $id, Coords => $coords
-                       , Metal => $metal, Crystal => $crystal, Eonium => $eonium, SecCents => $seccents
-                       , Dists => $dists, MaxResHack => $max, LastCovOp => $lastcovop, List => $list, ODD => $i % 2};
+       while (my $target = $query->fetchrow_hashref){
+               push @targets,$target;
        }
        $BODY->param(Targets => \@targets);
        return $BODY;