X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FMemberIntel.pm;h=4b204771192a76f818c26e08301289c2838fbe85;hb=9af56b1e9063f4935e8ff03e4ac7a83bae7e03ca;hp=0f585edd2a6cb0961909785fdfcb011b67f0b266;hpb=e395d07985706fdef07a2dee96e0f7f03edb5c89;p=ndwebbie.git

diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm
index 0f585ed..4b20477 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 * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+			LEFT OUTER JOIN (SELECT DISTINCT * FROM intel 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 * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+			JOIN (SELECT DISTINCT * FROM intel 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 * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+			LEFT OUTER JOIN (SELECT DISTINCT * FROM intel 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