X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FAlliances.pm;h=8f0b6c67555203131bbcb25b828e7978945eb6a8;hb=9519c80241167db071e44cbdd1e1843daad6e305;hp=5f3372655474d454f355131c6ebd0c58d0390372;hpb=07aec9f5f20e4a605d65bbe2337a05663c0b16e7;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Alliances.pm b/lib/NDWeb/Controller/Alliances.pm
index 5f33726..8f0b6c6 100644
--- a/lib/NDWeb/Controller/Alliances.pm
+++ b/lib/NDWeb/Controller/Alliances.pm
@@ -189,12 +189,8 @@ sub hostile : Local {
 	}
 
 	my $query = $dbh->prepare(q{
-		SELECT s.aid AS id,s.alliance AS name,count(*) AS hostile_count
-FROM calls c 
-	JOIN incomings i USING (call)
-	JOIN current_planet_stats s USING (pid)
-WHERE c.landing_tick - i.eta > $1 and c.landing_tick - i.eta < $2
-GROUP BY s.aid,s.alliance
+SELECT aid, alliance, hostile_count, targeted, targeted_raids
+FROM hostile_alliances($1,$2)
 ORDER BY hostile_count DESC
 		});
 	$query->execute($begintick,$endtick);