more fatal warnings and other cleanup

diff --git a/templates/top100.tmpl b/templates/top100.tmpl
index 76b10cfada5bd33ef95c23a7c32e357db18a8a9e..497e369087edbf9b0925259f8d190af0c2e1875c 100644 (file)
--- a/templates/top100.tmpl
+++ b/templates/top100.tmpl
@@ -1,3 +1,4 @@
+<TMPL_VAR NAME=Error>
 <p><a href="<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=PrevOffset>&amp;order=<TMPL_VAR NAME=Order>">Previous 100</a>
        <a href="<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=NextOffset>&amp;order=<TMPL_VAR NAME=Order>">Next 100</a></p>
 <table>
@@ -17,13 +18,13 @@
        <td><a href="check?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
        <td><TMPL_VAR NAME=Planet></td>
        <td><TMPL_VAR NAME=Race></td>
-       <td><TMPL_VAR NAME=Size></td>
-       <td><TMPL_VAR NAME=Score></td>
-       <td><TMPL_VAR NAME=Value></td>
-       <td><TMPL_VAR NAME=XP></td>
+       <td><TMPL_VAR NAME=Size>(<TMPL_VAR NAME=Sizerank>)</td>
+       <td><TMPL_VAR NAME=Score>(<TMPL_VAR NAME=Scorerank>)</td>
+       <td><TMPL_VAR NAME=Value>(<TMPL_VAR NAME=Valuerank>)</td>
+       <td><TMPL_VAR NAME=XP>(<TMPL_VAR NAME=XPrank>)</td>
        <TMPL_IF isHC>
-       <td class="<TMPL_VAR NAME=PlanetStatus>"><a href="intel?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Nick></a></td>
-       <td><TMPL_VAR NAME=HitUs></td>
+       <td class="<TMPL_VAR NAME=Planet_Status>"><a href="intel?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Nick>(<TMPL_VAR NAME=Planet_Status>)</a></td>
+       <td><TMPL_VAR NAME=Hit_Us></td>
        <td class="<TMPL_VAR NAME=Relationship>"><TMPL_VAR NAME=Alliance></td>
        </TMPL_IF>
        </tr>

diff --git a/top100.pl b/top100.pl
index 1a7d2e4233ba7a9f3372a7e9754297abb7b20817..ccd681be7080a2e006b3e5168c9c6252aef4de74 100644 (file)
--- a/top100.pl
+++ b/top100.pl
@@ -19,13 +19,13 @@
 
 use strict;
 use warnings FATAL => 'all';
-no warnings qw(uninitialized);
 
 $ND::TEMPLATE->param(TITLE => 'Top100 ');
 
 our $BODY;
 our $DBH;
 our $LOG;
+my $error = '';
 
 $BODY->param(isHC => isHC());
 
@@ -33,7 +33,7 @@ $BODY->param(isHC => isHC());
 die "You don't have access" unless isMember();
 
 my $offset = 0;
-if (param('offset') =~ /^(\d+)$/){
+if (defined param('offset') && param('offset') =~ /^(\d+)$/){
        $offset = $1;
 }
 $BODY->param(Offset => $offset);
@@ -41,7 +41,7 @@ $BODY->param(PrevOffset => $offset - 100);
 $BODY->param(NextOffset => $offset + 100);
 
 my $order = 'scorerank';
-if (param('order') =~ /^(scorerank|sizerank|valuerank|xprank|hit_us)$/){
+if (defined param('order') && param('order') =~ /^(scorerank|sizerank|valuerank|xprank|hit_us)$/){
        $order = $1;
 }
 $BODY->param(Order => $order);
@@ -52,28 +52,21 @@ my $extra_columns = '';
 if (isHC()){
        $extra_columns = ",planet_status,hit_us, alliance,relationship,nick";
 }
-my $query = $DBH->prepare(qq{SELECT id,coords(x,y,z), ruler, planet,race,
+my $query = $DBH->prepare(qq{SELECT coords(x,y,z),((ruler || ' OF ') || planet) as planet,race,
        size, score, value, xp, sizerank, scorerank, valuerank, xprank
        $extra_columns FROM current_planet_stats ORDER BY $order LIMIT 100 OFFSET ?});
-$query->execute($offset);
+$query->execute($offset) or $error .= p($DBH->errstr);
 my @planets;
 my $i = 0;
-while (my ($id,$coords,$ruler,$planet,$race,$size,$score,$value,$xp,$sizerank,$scorerank,$valuerank,$xprank
-               ,$planet_status,$hit_us,$alliance,$relationship,$nick) = $query->fetchrow){
-       my %planet = (Coords => $coords, Planet => "$ruler OF $planet", Race => $race, Size => "$size ($sizerank)"
-               , Score => "$score ($scorerank)", Value => "$value ($valuerank)", XP => "$xp ($xprank)");
+while (my $planet = $query->fetchrow_hashref){
        if (isHC){
-               $planet{HitUs} = $hit_us;
-               $planet{Alliance} = "$alliance ($relationship)";
-               $planet{Nick} = "$nick ($planet_status)";
-               $planet{PlanetStatus} = $planet_status;
-               $planet{Relationship} = $relationship;
-               $planet{isHC} = 1;
+               $planet->{isHC} = 1;
        }
        $i++;
-       $planet{ODD} = $i % 2;
-       push @planets,\%planet;
+       $planet->{ODD} = $i % 2;
+       push @planets,$planet;
 }
 $BODY->param(Planets => \@planets);
+$BODY->param(Error => $error);
 
 1;