X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRankings.pm;h=45f2a79959c59191a7b00201029a0b218aad7a0c;hb=9519c80241167db071e44cbdd1e1843daad6e305;hp=30407c659c897884a6269315f2598baa969cc6fe;hpb=f9f06136c85f9634c409b71e18452c358530556e;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Rankings.pm b/lib/NDWeb/Controller/Rankings.pm
index 30407c6..45f2a79 100644
--- a/lib/NDWeb/Controller/Rankings.pm
+++ b/lib/NDWeb/Controller/Rankings.pm
@@ -36,10 +36,9 @@ sub planets : Local {
 	my $error = '';
 
 	$offset = 0 unless $offset;
+	$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 {
@@ -57,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,
@@ -74,6 +73,7 @@ sub planets : Local {
 	while (my $planet = $query->fetchrow_hashref){
 		push @planets,$planet;
 	}
+	$c->detach('/default') unless @planets;
 	$c->stash(planets => \@planets);
 }
 
@@ -84,10 +84,9 @@ sub galaxies : Local {
 	my $error = '';
 
 	$offset = 0 unless $offset;
+	$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{
@@ -118,6 +117,7 @@ sub galaxies : Local {
 	while (my $galaxy = $query->fetchrow_hashref){
 		push @galaxies,$galaxy;
 	}
+	$c->detach('/default') unless @galaxies;
 	$c->stash(galaxies => \@galaxies);
 }
 
@@ -129,10 +129,9 @@ sub alliances : Local {
 	my $error = '';
 
 	$offset = 0 unless $offset;
+	$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{
@@ -144,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,
@@ -170,6 +169,7 @@ sub alliances : Local {
 	while (my $alliance = $query->fetchrow_hashref){
 		push @alliances,$alliance;
 	}
+	$c->detach('/default') unless @alliances;
 	$c->stash(alliances => \@alliances);
 }