X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FMemberIntel.pm;h=292d985d54afb27f92665befca4fcf2f11d6ac40;hb=57f880656c4486f68583058121a5bcb3b316199c;hp=ab73864245bc9ac2566c6117f384d569e13af2ba;hpb=b3d60946973fc4d48b32c2447522f0bba02087d3;p=ndwebbie.git diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm index ab73864..292d985 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 fleets WHERE amount = -1) i ON i.sender = u.planet + LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM fleets WHERE amount IS NULL) 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 @@ -94,7 +94,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 fleets WHERE amount = -1) i ON i.sender = u.planet + JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM fleets WHERE amount IS NULL) 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) @@ -133,7 +133,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 fleets WHERE amount = -1) i ON i.sender = u.planet + LEFT OUTER JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM fleets WHERE amount IS NULL) 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