]> ruin.nu Git - ndwebbie.git/commitdiff
gal rankings and fixed a bug with gal graph caching
authorMichael Andreen <harv@ruin.nu>
Sat, 3 Mar 2007 11:27:58 +0000 (11:27 +0000)
committerMichael Andreen <harv@ruin.nu>
Sat, 3 Mar 2007 11:27:58 +0000 (11:27 +0000)
ND/Web/Pages/GalaxyRankings.pm [new file with mode: 0644]
ND/Web/Pages/Graph.pm
startup.pl
templates/galaxyrankings.tmpl [new file with mode: 0644]
templates/skel.tmpl

diff --git a/ND/Web/Pages/GalaxyRankings.pm b/ND/Web/Pages/GalaxyRankings.pm
new file mode 100644 (file)
index 0000000..d09c8e5
--- /dev/null
@@ -0,0 +1,109 @@
+#**************************************************************************
+#   Copyright (C) 2006 by Michael Andreen <harvATruinDOTnu>               *
+#                                                                         *
+#   This program is free software; you can redistribute it and/or modify  *
+#   it under the terms of the GNU General Public License as published by  *
+#   the Free Software Foundation; either version 2 of the License, or     *
+#   (at your option) any later version.                                   *
+#                                                                         *
+#   This program is distributed in the hope that it will be useful,       *
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+#   GNU General Public License for more details.                          *
+#                                                                         *
+#   You should have received a copy of the GNU General Public License     *
+#   along with this program; if not, write to the                         *
+#   Free Software Foundation, Inc.,                                       *
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+#**************************************************************************/
+
+package ND::Web::Pages::GalaxyRankings;
+use strict;
+use warnings FATAL => 'all';
+use CGI qw/:standard/;
+use ND::Web::Include;
+
+use base qw/ND::Web::XMLPage/;
+
+$ND::Web::Page::PAGES{galaxyrankings} = __PACKAGE__;
+
+sub parse {
+       #TODO: Need to fix some links first
+       #if ($uri =~ m{^/[^/]+/(\w+)}){
+       #       param('order',$1);
+       #}
+}
+
+sub render_body {
+       my $self = shift;
+       my ($BODY) = @_;
+       $self->{TITLE} = 'Top Galaxies';
+       my $DBH = $self->{DBH};
+
+       return $self->noAccess unless $self->isMember;
+
+       my $error = '';
+
+       $BODY->param(isHC => $self->isHC);
+
+       my $offset = 0;
+       if (defined param('offset') && param('offset') =~ /^(\d+)$/){
+               $offset = $1;
+       }
+       $BODY->param(Offset => $offset);
+       $BODY->param(PrevOffset => $offset - 100);
+       $BODY->param(NextOffset => $offset + 100);
+
+       my $order = 'scorerank';
+       if (defined param('order') && param('order') =~ /^(scorerank|sizerank|planets|xprank|avgscore)$/){
+               $order = $1;
+       }
+       $BODY->param(Order => $order);
+       $order .= ' DESC' unless $order =~ /rank$/;
+
+
+       #my $extra_columns = '';
+       #if ($self->isHC){
+       #       $extra_columns = ",galaxy_status,hit_us, galaxy,relationship,nick";
+       #}
+       my $query = $DBH->prepare(qq{SELECT x,y,
+               size, size_gain, size_gain_day,
+               score,score_gain,score_gain_day,
+               value,value_gain,value_gain_day,
+               xp,xp_gain,xp_gain_day,
+               sizerank,sizerank_gain,sizerank_gain_day,
+               scorerank,scorerank_gain,scorerank_gain_day,
+               valuerank,valuerank_gain,valuerank_gain_day,
+               xprank,xprank_gain,xprank_gain_day,
+               planets,planets_gain,planets_gain_day
+       FROM galaxies g WHERE tick = ( SELECT max(tick) AS max FROM galaxies)
+       ORDER BY $order LIMIT 100 OFFSET ?});
+       $query->execute($offset) or $error .= p($DBH->errstr);
+       my @galaxies;
+       my $i = 0;
+       while (my $galaxy = $query->fetchrow_hashref){
+               for my $type (qw/planets size score xp value/){
+                       #$galaxy->{$type} = prettyValue($galaxy->{$type});
+                       next unless defined $galaxy->{"${type}_gain_day"};
+                       $galaxy->{"${type}img"} = 'stay';
+                       $galaxy->{"${type}img"} = 'up' if $galaxy->{"${type}_gain_day"} > 0;
+                       $galaxy->{"${type}img"} = 'down' if $galaxy->{"${type}_gain_day"} < 0;
+                       unless( $type eq 'planets'){
+                               $galaxy->{"${type}rankimg"} = 'stay';
+                               $galaxy->{"${type}rankimg"} = 'up' if $galaxy->{"${type}rank_gain_day"} < 0;
+                               $galaxy->{"${type}rankimg"} = 'down' if $galaxy->{"${type}rank_gain_day"} > 0;
+                       }
+                       for my $type ($type,"${type}_gain","${type}_gain_day"){
+                               $galaxy->{$type} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000
+                       }
+               }
+               $i++;
+               $galaxy->{ODD} = $i % 2;
+               push @galaxies,$galaxy;
+       }
+       $BODY->param(Galaxies => \@galaxies);
+       $BODY->param(Error => $error);
+       return $BODY;
+}
+
+1;
index d757d1345321e20238c83999c0fb0c43fbe612a8..d03435312a7bae2acbe896939e016bceb0dd8509 100644 (file)
@@ -53,7 +53,7 @@ sub render_body {
                                ($req{id}) = $DBH->selectrow_array(q{SELECT planetid($1,$2,$3,$4)},undef,$1,$2,$3,$tick);
                        }else{
                                $type = "gal$type";
-                               $req{id} = 100*$2+$2;
+                               $req{id} = 100*$1+$2;
                        }
                }
        }elsif($self->{URI} =~ m{^/\w+/(alliance(?:avg)?)/(\d+)}){
@@ -96,7 +96,7 @@ sub render_body {
                        $graph_settings{y_max_value} = 0;
                }
                $query->execute($x,$y,$z,$tick) or die $DBH->errstr;
-               $graph_settings{title} = $type;
+               $graph_settings{title} = "$type: $x:$y:$z";
                $graph_settings{two_axes} = 1;
                $graph_settings{use_axis} = [2,1,2,2];
                $img = graphFromQuery 500,300,\%graph_settings,$query;
@@ -111,7 +111,7 @@ sub render_body {
                        $graph_settings{y_max_value} = 0;
                }
                $query->execute($x,$y) or die $DBH->errstr;
-               $graph_settings{title} = $type;
+               $graph_settings{title} = "$type: $x:$y";
                $graph_settings{two_axes} = 1;
                $graph_settings{use_axis} = [2,1,2,2];
                $img = graphFromQuery 500,300,\%graph_settings,$query;
index 9f8403a5c0202f20133fd32362cf038055552fad..996b3b7449969b26be964ab5b89a93fc7af752f7 100644 (file)
@@ -53,6 +53,7 @@ use ND::Web::Pages::Graph;
 use ND::Web::Pages::Mail;
 use ND::Web::Pages::HostileAlliances;
 use ND::Web::Pages::AllianceRankings;
+use ND::Web::Pages::GalaxyRankings;
 
 
 
diff --git a/templates/galaxyrankings.tmpl b/templates/galaxyrankings.tmpl
new file mode 100644 (file)
index 0000000..ef9b532
--- /dev/null
@@ -0,0 +1,41 @@
+<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 class="stats">
+       <tr align="center"><th colspan="4">Rank</th>
+       </tr>
+       <tr>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=sizerank">Size</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=scorerank">Score</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=valuerank">Value</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=xprank">XP</a></th>
+       <th>Coords</th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=planets">Planets</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=sizerank">Size</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=scorerank">Score</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=valuerank">Value</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=xprank">XP</a></th>
+       <TMPL_IF isHC>
+       </TMPL_IF>
+       </tr>
+       <TMPL_LOOP Galaxies>
+       <tr align="right" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+               <td title="<TMPL_VAR NAME=SizeRank_Gain_day> Today | <TMPL_VAR NAME=SizeRank_Gain> Tick"><TMPL_VAR NAME=SizeRank> <img src="/images/<TMPL_VAR NAME=SizeRankImg>.png" alt="<TMPL_VAR NAME=SizeImg>"/> </td>
+               <td title="<TMPL_VAR NAME=ScoreRank_Gain_day> Today | <TMPL_VAR NAME=ScoreRank_Gain> Tick"><TMPL_VAR NAME=ScoreRank> <img src="/images/<TMPL_VAR NAME=ScoreRankImg>.png" alt="<TMPL_VAR NAME=ScoreImg>"/> </td>
+               <td title="<TMPL_VAR NAME=ValueRank_Gain_day> Today | <TMPL_VAR NAME=ValueRank_Gain> Tick"><TMPL_VAR NAME=ValueRank> <img src="/images/<TMPL_VAR NAME=ValueRankImg>.png" alt="<TMPL_VAR NAME=ValueImg>"/> </td>
+               <td title="<TMPL_VAR NAME=XPRank_Gain_day> Today | <TMPL_VAR NAME=XPRank_Gain> Tick"><TMPL_VAR NAME=XPRank> <img src="/images/<TMPL_VAR NAME=XPRankImg>.png" alt="<TMPL_VAR NAME=XPImg>"/> </td>
+
+               <td><a href="/check?coords=<TMPL_VAR NAME=X>:<TMPL_VAR NAME=Y>"><TMPL_VAR NAME=X>:<TMPL_VAR NAME=Y></a></td>
+               <td title="<TMPL_VAR NAME=Planets_Gain_day> Today | <TMPL_VAR NAME=Planets_Gain> Tick"><TMPL_VAR NAME=Planets> <img src="/images/<TMPL_VAR NAME=PlanetsImg>.png" alt="<TMPL_VAR NAME=PlanetsImg>"/> </td>
+               <td title="<TMPL_VAR NAME=Size_Gain_day> Today | <TMPL_VAR NAME=Size_Gain> Tick"><TMPL_VAR NAME=Size> <img src="/images/<TMPL_VAR NAME=SizeImg>.png" alt="<TMPL_VAR NAME=SizeImg>"/> </td>
+               <td title="<TMPL_VAR NAME=Score_Gain_day> Today | <TMPL_VAR NAME=Score_Gain> Tick"><TMPL_VAR NAME=Score> <img src="/images/<TMPL_VAR NAME=ScoreImg>.png" alt="<TMPL_VAR NAME=ScoreImg>"/> </td>
+               <td title="<TMPL_VAR NAME=Value_Gain_day> Today | <TMPL_VAR NAME=Value_Gain> Tick"><TMPL_VAR NAME=Value> <img src="/images/<TMPL_VAR NAME=ValueImg>.png" alt="<TMPL_VAR NAME=ValueImg>"/> </td>
+               <td title="<TMPL_VAR NAME=XP_Gain_day> Today | <TMPL_VAR NAME=XP_Gain> Tick"><TMPL_VAR NAME=XP> <img src="/images/<TMPL_VAR NAME=XPImg>.png" alt="<TMPL_VAR NAME=XPImg>"/> </td>
+
+       <TMPL_IF isHC>
+       </TMPL_IF>
+       </tr>
+       </TMPL_LOOP>
+</table>
+<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>
index 573adc816800d83175df51d98e17301d9c9f0618..2be8aee51facd9f60d7330e80af4ff1ddc792116 100644 (file)
@@ -29,6 +29,7 @@
                <li><a href="/covop?list=distwhores">Distwhores</a></li>
                <li><a href="/planetrankings">Planet Rankings</a></li>
                <li><a href="/alliancerankings">Alliance Rankings</a></li>
+               <li><a href="/galaxyrankings">Galaxy Rankings</a></li>
                <li><a href="/defrequest">Request defense</a></li>
        </ul>
        </TMPL_IF>