From: Michael Andreen <harv@ruin.nu>
Date: Wed, 9 Jan 2008 12:42:32 +0000 (+0100)
Subject: member intel page updated for new fleets structure
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=714846d8dc9f1302a758767c208934b04085a9ce;p=ndwebbie.git

member intel page updated for new fleets structure
---

diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm
index 1a5ffa8..36eb09a 100644
--- a/NDWeb/Pages/MemberIntel.pm
+++ b/NDWeb/Pages/MemberIntel.pm
@@ -57,7 +57,7 @@ sub render_body {
 		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
 			FROM users u
-			LEFT OUTER JOIN (SELECT DISTINCT * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+			LEFT OUTER JOIN (SELECT DISTINCT * FROM fleets WHERE amount = -1) i ON i.sender = u.planet
 			LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
 			LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r 
 					JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target 
@@ -98,7 +98,7 @@ sub render_body {
 		$query = $DBH->prepare(q{
 			SELECT coords(t.x,t.y,t.z),t.alliance_id, t.alliance, i.eta, i.tick, i.ingal
 			FROM users u
-			JOIN (SELECT DISTINCT * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+			JOIN (SELECT DISTINCT * FROM fleets WHERE amount = -1) i ON i.sender = u.planet
 			LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
 			WHERE u.uid = $1 AND (i.mission = 'Defend' OR i.mission = 'AllyDef')
 			ORDER BY (i.tick - i.eta)
@@ -143,7 +143,7 @@ sub render_body {
 			FROM users u
 			JOIN groupmembers gm USING (uid)
 			LEFT OUTER JOIN (SELECT DISTINCT ON (planet) planet,tick from scans where type = 'News' ORDER BY planet,tick DESC) n USING (planet)
-			LEFT OUTER JOIN (SELECT DISTINCT * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+			LEFT OUTER JOIN (SELECT DISTINCT * FROM fleets WHERE amount = -1) i ON i.sender = u.planet
 			LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
 			LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r 
 					JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target