X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FAlliances.pm;h=76ed462fa4c2188d157c07aa571db8f25efd85b5;hb=15e271f8e65bfc35d311f9b9cad581e3a1c70def;hp=983ccea3b30bd95d5284fcae4aa13eeb9fbc955e;hpb=5b6c3c7d0003d636c1c3da6d25734e4aad5736a5;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Alliances.pm b/lib/NDWeb/Controller/Alliances.pm
index 983ccea..76ed462 100644
--- a/lib/NDWeb/Controller/Alliances.pm
+++ b/lib/NDWeb/Controller/Alliances.pm
@@ -84,7 +84,7 @@ sub edit : Local {
 	$order .= ' DESC' if $order eq 'hit_us';
 
 	my $members = $dbh->prepare(q{
-		SELECT coords(x,y,z), nick, ruler, planet, race, size, score, value, xp
+		SELECT id, coords(x,y,z), nick, ruler, planet, race, size, score, value, xp
 			,planet_status,hit_us, sizerank, scorerank, valuerank, xprank
 		FROM current_planet_stats p
 		WHERE p.alliance_id = ?
@@ -224,9 +224,12 @@ sub resources : Local {
 		,((s.size::int8*(1400-tick())*250)/100 + score + (resources/planets*scoremem)/300
 			+ (hidden/planets*scoremem)/100)::bigint AS nscore3
 		,(s.size::int8*(1400-tick())*250)/100 AS scoregain3
-		FROM (SELECT alliance_id AS id,sum(metal+crystal+eonium) AS resources, sum(hidden) AS hidden, count(*) AS planets 
-		FROM planets p join planet_scans c ON p.id = c.planet GROUP by alliance_id) r 
-			NATURAL JOIN alliances a 
+		FROM (SELECT alliance_id AS id,sum(metal+crystal+eonium) AS resources
+				, sum(hidden) AS hidden, count(*) AS planets
+				FROM planets p join current_planet_scans c ON p.id = c.planet
+				GROUP by alliance_id
+			) r
+			NATURAL JOIN alliances a
 			LEFT OUTER JOIN (SELECT *,LEAST(members,60) AS scoremem FROM alliance_stats
 				WHERE tick = (SELECT max(tick) FROM alliance_stats)) s ON a.id = s.id
 		ORDER BY $order