Only join claims on correct wave

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

diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm
index 0f585edd2a6cb0961909785fdfcb011b67f0b266..1a5ffa8af2ff17667dcddf5ed7c5ce90ec59914d 100644 (file)
--- a/NDWeb/Pages/MemberIntel.pm
+++ b/NDWeb/Pages/MemberIntel.pm
@@ -57,12 +57,12 @@ 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 
                                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
+                       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 sender, eta, landing_tick FROM calls c 
                                                JOIN incomings i ON i.call = c.id) inc ON inc.sender = i.target 
                                        AND (inc.landing_tick + inc.eta) >= i.tick 
@@ -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,12 +143,12 @@ 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 
                                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
+                       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
                        GROUP BY u.uid,u.username,u.attack_points, u.defense_points,n.tick
                        ORDER BY $order DESC});