X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FTargetList.pm;h=97c0be4fdcfcb9594d60a9d611e81fde13678f33;hb=34876053e79ee0153b38c8cad7c9404322472f29;hp=f321a927268b4b48db1b0bdf2654695405de6a7d;hpb=155bd6f2977a197e804950e135dd48272e2f8efd;p=ndwebbie.git diff --git a/NDWeb/Pages/TargetList.pm b/NDWeb/Pages/TargetList.pm index f321a92..97c0be4 100644 --- a/NDWeb/Pages/TargetList.pm +++ b/NDWeb/Pages/TargetList.pm @@ -55,7 +55,7 @@ FROM current_planet_stats p JOIN (SELECT g.x,g.y, sum(p.value) AS nfvalue FROM galaxies g join current_planet_stats p on g.x = p.x AND g.y = p.y WHERE g.tick = (SELECT max(tick) from galaxies) - AND ((planet_status IS NULL OR NOT planet_status IN ('Friendly','NAP')) AND (relationship IS NULL OR NOT relationship IN ('Friendly','NAP'))) + AND ((NOT planet_status IN ('Friendly','NAP')) AND (NOT relationship IN ('Friendly','NAP'))) GROUP BY g.x,g.y ) g ON p.x = g.x AND p.y = g.y JOIN current_planet_stats pa ON pa.x = g.x AND pa.y = g.y