X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FAlliances.pm;h=f9b830fc1c58a10c0a416a25a36a1e4dddb804dc;hb=67656e7f539b7fd6470ecf6a7653edcf871875bb;hp=117b0e4b9671adea435a69f07bbcd1a2ee239e7e;hpb=2a887f9ecbcb699418d9d55875b4737d87c10f15;p=ndwebbie.git diff --git a/ND/Web/Pages/Alliances.pm b/ND/Web/Pages/Alliances.pm index 117b0e4..f9b830f 100644 --- a/ND/Web/Pages/Alliances.pm +++ b/ND/Web/Pages/Alliances.pm @@ -24,7 +24,7 @@ use ND::Include; use CGI qw/:standard/; use ND::Web::Include; -our @ISA = qw/ND::Web::XMLPage/; +use base qw/ND::Web::XMLPage/; $ND::Web::Page::PAGES{alliances} = __PACKAGE__; @@ -130,7 +130,7 @@ sub render_body { $order = "$1 DESC"; } 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(*) AS kmem, + 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(AVG(p.size)::int,-1) AS ksiavg, COALESCE(AVG(p.xp)::int,-1) AS kxpavg, COALESCE(AVG(p.value)::int,-1) AS kvalavg