top100 class

diff --git a/ND/Web/Pages/Top100.pm b/ND/Web/Pages/Top100.pm
index a962b2dabd543a2ee4d3300d1aac30337f2c04ca..d01aaaf848ccc2e991db2803921e8fb481b8b207 100644 (file)
--- a/ND/Web/Pages/Top100.pm
+++ b/ND/Web/Pages/Top100.pm
@@ -23,29 +23,28 @@ use warnings FATAL => 'all';
 use CGI qw/:standard/;
 use ND::Web::Include;
 
-$ND::PAGES{top100} = {parse => \&parse, process => \&process, render=> \&render};
+our @ISA = qw/ND::Web::XMLPage/;
+
+$ND::Web::Page::PAGES{top100} = __PACKAGE__;
 
 sub parse {
-       my ($uri) = @_;
        #TODO: Need to fix some links first
        #if ($uri =~ m{^/[^/]+/(\w+)}){
        #       param('order',$1);
        #}
 }
 
-sub process {
-
-}
+sub render_body {
+       my $self = shift;
+       my ($BODY) = @_;
+       $self->{TITLE} = 'Top planets';
+       my $DBH = $self->{DBH};
 
-sub render {
-       my ($DBH,$BODY) = @_;
-       $ND::TEMPLATE->param(TITLE => 'Top100 ');
+       return $self->noAccess unless $self->isMember;
 
        my $error = '';
 
-       $BODY->param(isHC => isHC());
-
-       return $ND::NOACCESS unless isMember();
+       $BODY->param(isHC => $self->isHC);
 
        my $offset = 0;
        if (defined param('offset') && param('offset') =~ /^(\d+)$/){
@@ -64,7 +63,7 @@ sub render {
 
 
        my $extra_columns = '';
-       if (isHC()){
+       if ($self->isHC){
                $extra_columns = ",planet_status,hit_us, alliance,relationship,nick";
        }
        my $query = $DBH->prepare(qq{SELECT coords(x,y,z),((ruler || ' OF ') || planet) as planet,race,
@@ -74,9 +73,6 @@ sub render {
        my @planets;
        my $i = 0;
        while (my $planet = $query->fetchrow_hashref){
-               if (isHC){
-                       $planet->{isHC} = 1;
-               }
                $i++;
                $planet->{ODD} = $i % 2;
                push @planets,$planet;

diff --git a/startup.pl b/startup.pl
index 4408122a42fa649e1c20bf8edb21f2634c062676..e3b0cd7b505cf42dff64b76947ba47b035a61c3f 100644 (file)
--- a/startup.pl
+++ b/startup.pl
@@ -32,7 +32,7 @@ use ND::Web::Pages::AddIntel;
 use ND::Web::Pages::Points;
 use ND::Web::Pages::LaunchConfirmation;
 use ND::Web::Pages::CovOp;
-#use ND::Web::Pages::Top100;
+use ND::Web::Pages::Top100;
 #use ND::Web::Pages::DefRequest;
 #use ND::Web::Pages::Check;
 #use ND::Web::Pages::Raids;