X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FAlliances.pm;h=48975c1ce95689eaa0889d084c9c2239b19880a4;hb=f6cfe40e6a8da61229131a2d38a2535ae66da359;hp=69d7c92594695bfbaa6fe88e15ad3e5f34045120;hpb=c6a6e6dbab0ca435e6aeeb94e7c7329585b7b4f1;p=ndwebbie.git diff --git a/ND/Web/Pages/Alliances.pm b/ND/Web/Pages/Alliances.pm index 69d7c92..48975c1 100644 --- a/ND/Web/Pages/Alliances.pm +++ b/ND/Web/Pages/Alliances.pm @@ -132,7 +132,7 @@ sub render_body { my $query = $DBH->prepare(qq{ SELECT DISTINCT a.id,name,COALESCE(s.score,SUM(p.score)) AS score,COALESCE(s.size,SUM(p.size)) AS size,s.members,count(p.score) AS kmem, COALESCE(SUM(p.score),-1) AS kscore, COALESCE(SUM(p.size),-1) AS ksize, COALESCE(SUM(p.xp),-1) AS kxp,COALESCE(SUM(p.value),-1) AS kvalue, - COALESCE(s.score/LEAST(s.members,60),-1) AS scavg, COALESCE(AVG(p.score)::int,-1) AS kscavg, COALESCE(s.size/s.members,-1) AS siavg, + COALESCE(s.score/s.members,-1) AS scavg, COALESCE(AVG(p.score)::int,-1) AS kscavg, COALESCE(s.size/s.members,-1) AS siavg, COALESCE(AVG(p.size)::int,-1) AS ksiavg, COALESCE(AVG(p.xp)::int,-1) AS kxpavg, COALESCE(AVG(p.value)::int,-1) AS kvalavg FROM alliances a LEFT OUTER JOIN (SELECT * FROM alliance_stats WHERE tick = (SELECT max(tick) FROM alliance_stats)) s ON s.id = a.id