Ignore if target already marked

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

diff --git a/lib/NDWeb/Controller/CovOp.pm b/lib/NDWeb/Controller/CovOp.pm
index ea67978ef9fd8037de2d9baf24d8bc1674bef33c..d114726bd440525899d205ad9e62fefe25b751c7 100644 (file)
--- a/lib/NDWeb/Controller/CovOp.pm
+++ b/lib/NDWeb/Controller/CovOp.pm
@@ -38,11 +38,11 @@ sub distwhores : Local {
 sub marktarget : Local {
        my ( $self, $c, $target ) = @_;
        my $dbh = $c->model;
-
        my $update = $dbh->prepare(q{INSERT INTO covop_attacks (uid,id,tick) VALUES(?,?,tick())});
-       $update->execute($c->user->id,$target);
-
-       $c->res->redirect($c->req->referer);
+       eval{
+               $update->execute($c->user->id,$target);
+       };
+       $c->forward('/redirect');
 }
 
 sub list : Private {
@@ -52,13 +52,13 @@ sub list : Private {
        my $query = $dbh->prepare(q{SELECT id, coords, metal, crystal, eonium
                , covop_alert(seccents,structures,size,guards,gov,0) AS minalert
                , covop_alert(seccents,structures,size,guards,gov,50) AS maxalert
-               , distorters,gov
+               , distorters,gov,pstick,dstick
                , MaxResHack,co.tick AS lastcovop
                FROM (SELECT p.id,coords(x,y,z),size, metal,crystal,eonium,guards
                        ,seccents,NULLIF(ds.total::integer,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,gov
+                       , planet_status, relationship,gov,ps.tick AS pstick, ds.tick AS dstick
                        FROM current_planet_stats p
                                LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet
                                LEFT OUTER JOIN current_development_scans ds ON p.id = ds.planet