X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FIntel.pm;h=9666282e1f805c31fafac2af5784a77866f8f269;hb=23e133163ef06e0afc2000152df31c966f4929b2;hp=64fe55aa21e3f23fa37bdba5a1e1606aac8f2bae;hpb=aa42aa5497f10f957d426f5777a746f3af49f534;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Intel.pm b/lib/NDWeb/Controller/Intel.pm
index 64fe55a..9666282 100644
--- a/lib/NDWeb/Controller/Intel.pm
+++ b/lib/NDWeb/Controller/Intel.pm
@@ -31,13 +31,14 @@ sub index :Path : Args(0) {
 	my $ticks = $c->req->param('ticks') || 48;
 	$c->stash(showticks => $ticks);
 
-	my $query = $dbh->prepare(intelquery q{
-			o.alliance AS oalliance ,coords(o.x,o.y,o.z) AS ocoords, i.sender
-			,t.alliance AS talliance,coords(t.x,t.y,t.z) AS tcoords, i.target
-		},q{not ingal
-			AND ((COALESCE( t.alliance != o.alliance,TRUE) AND (i.mission = 'Defend' OR i.mission = 'AllyDef' ))
-				OR ( t.alliance = o.alliance AND i.mission = 'Attack'))
-			AND i.tick > (tick() - $1)
+	my $query = $dbh->prepare(q{
+SELECT salliance, scoords, sender, talliance, tcoords, target
+	,mission, tick AS landingtick, eta, amount, ingal, username
+FROM full_intel
+WHERE NOT ingal AND tick > (tick() - $1)
+	AND ((COALESCE( talliance <> salliance,TRUE) AND (mission = 'Defend' OR mission = 'AllyDef' ))
+		OR ( talliance = salliance AND mission = 'Attack'))
+ORDER BY tick DESC, mission
 		});
 	$query->execute($ticks);
 	$c->stash(intel => $query->fetchall_arrayref({}) );
@@ -82,18 +83,37 @@ sub planet : Local {
 	$c->stash(govs => ["","Feu", "Dic", "Dem","Uni"]);
 	$c->stash(planetstatus => ["","Friendly", "NAP", "Hostile"]);
 
-	$query = $dbh->prepare(intelquery q{i.sender
-			,o.alliance AS oalliance,coords(o.x,o.y,o.z) AS ocoords
-		},q{i.target = $1 AND i.tick > (tick() - $2)});
+	$query = $dbh->prepare(q{
+SELECT salliance, scoords, sender
+	,mission, tick AS landingtick, eta, amount, ingal, username
+FROM full_intel
+WHERE target = $1 AND tick > (tick() - $2)
+ORDER BY tick DESC, mission
+		});
 	$query->execute($id,$ticks);
 	$c->stash(incoming => $query->fetchall_arrayref({}) );
 
-	$query = $dbh->prepare(intelquery q{i.target
-			,t.alliance AS talliance,coords(t.x,t.y,t.z) AS tcoords
-		},q{i.sender = $1 AND i.tick > (tick() - $2)});
+	$query = $dbh->prepare(q{
+SELECT talliance, tcoords, target
+	,mission, tick AS landingtick, eta, amount, ingal, username
+FROM full_intel
+WHERE sender = $1 AND tick > (tick() - $2)
+ORDER BY tick DESC, mission
+		});
 	$query->execute($id,$ticks);
 	$c->stash(outgoing => $query->fetchall_arrayref({}) );
 
+	$query = $dbh->prepare(q{
+SELECT tag, array_to_string(array_agg(username),', ') AS nicks, to_char(max(time),'YYYY-MM-DD HH24:MI') AS time
+FROM planet_tags pt
+	JOIN users u USING (uid)
+WHERE pt.pid = $1
+GROUP BY tag
+ORDER BY time DESC
+		});
+	$query->execute($id);
+	$c->stash(tags => $query->fetchall_arrayref({}) );
+
 }
 
 sub channels : Local {
@@ -237,7 +257,7 @@ sub members : Local {
 				JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.pid = i.target
 			AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick
 		LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid AND i.tick = rt.tick + rc.wave - 1
-		WHERE gm.gid = 2
+		WHERE gm.gid = 'M'
 		GROUP BY u.uid,u.username,u.attack_points, u.defense_points,n.tick
 		ORDER BY }. " $order DESC" );
 	$query->execute;
@@ -249,7 +269,7 @@ sub member : Local {
 	my $dbh = $c->model;
 
 	my $query = $dbh->prepare(q{
-		SELECT coords(t.x,t.y,t.z), i.eta, i.tick, rt.id AS ndtarget, rc.launched, inc.landing_tick
+		SELECT coords(t.x,t.y,t.z), i.eta, i.tick, rt.id AS ndtarget, rc.launched
 		FROM users u
 		LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM intel WHERE amount IS NULL) i ON i.sender = u.pid
 		LEFT OUTER JOIN current_planet_stats t ON i.target = t.pid
@@ -257,10 +277,6 @@ sub member : Local {
 				JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.pid = i.target
 			AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick
 		LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid AND i.tick = rt.tick + rc.wave - 1
-		LEFT OUTER JOIN (SELECT pid, eta, landing_tick FROM calls c
-					JOIN incomings i USING (call)) inc ON inc.pid = i.target
-				AND (inc.landing_tick + inc.eta) >= i.tick 
-				AND (inc.landing_tick - inc.eta - 1) <= (i.tick - i.eta)
 		WHERE u.uid = $1 AND i.mission = 'Attack'
 		ORDER BY (i.tick - i.eta)
 		});