X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRankings.pm;h=45f2a79959c59191a7b00201029a0b218aad7a0c;hb=23470c3481cbd9e7dfa3bfa5cf05bbb41d098cc6;hp=1575d4e0d574642ed760c0bebc65d5870e350cc4;hpb=28cc9c2d61cf6ee0bfcd02c82e0195efaf6cf27a;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Rankings.pm b/lib/NDWeb/Controller/Rankings.pm
index 1575d4e..45f2a79 100644
--- a/lib/NDWeb/Controller/Rankings.pm
+++ b/lib/NDWeb/Controller/Rankings.pm
@@ -39,8 +39,6 @@ sub planets : Local {
 	$c->detach('/default') if $offset < 0;
 	$c->stash(offset => $offset);
 
-	$c->stash( comma => \&comma_value);
-
 	if (defined $order && $order =~ /^(scorerank|sizerank|valuerank|xprank|hit_us)$/){
 		$order = $1;
 	}else {
@@ -58,7 +56,7 @@ sub planets : Local {
 		$extra_columns = ",planet_status,hit_us, alliance,relationship,nick";
 	}
 
-	my $query = $dbh->prepare(qq{SELECT id,x,y,z,ruler,planet,race,
+	my $query = $dbh->prepare(qq{SELECT pid AS id,x,y,z,ruler,planet,race,
 		size, size_gain, size_gain_day,
 		score,score_gain,score_gain_day,
 		value,value_gain,value_gain_day,
@@ -89,8 +87,6 @@ sub galaxies : Local {
 	$c->detach('/default') if $offset < 0;
 	$c->stash(offset => $offset);
 
-	$c->stash( comma => \&comma_value);
-
 	if (defined $order && $order =~ /^(scorerank|sizerank|valuerank|xprank|planets)$/){
 		$order = $1;
 	}else{
@@ -136,8 +132,6 @@ sub alliances : Local {
 	$c->detach('/default') if $offset < 0;
 	$c->stash(offset => $offset);
 
-	$c->stash( comma => \&comma_value);
-
 	if (defined $order && $order =~ /^(scorerank|sizerank|valuerank|xprank|avgsize|avgscore|members)$/){
 		$order = $1;
 	}else{
@@ -149,7 +143,7 @@ sub alliances : Local {
 	if ($order =~ /rank$/){
 		$browse = qq{WHERE $order > ? ORDER BY $order ASC LIMIT 100};
 	}
-	my $query = $dbh->prepare(qq{SELECT a.name,a.id,
+	my $query = $dbh->prepare(qq{SELECT alliance AS name,aid AS id,
 		size, size_gain, size_gain_day,
 		score,score_gain,score_gain_day,
 		avgsize,avgsize_gain,avgsize_gain_day,