X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FCheck.pm;h=f68c949f6d4d6bb5d8cd9596b5c4fa44f96a1c10;hb=5bdf7f1c03127ec37bd29852ebc0279431ad93aa;hp=60600bb66c7c1f6d7cc6fa0970954162d06cc32a;hpb=9ce5a8529e75cb109ed9ba3fc788c94ef47b1080;p=ndwebbie.git
diff --git a/ND/Web/Pages/Check.pm b/ND/Web/Pages/Check.pm
index 60600bb..f68c949 100644
--- a/ND/Web/Pages/Check.pm
+++ b/ND/Web/Pages/Check.pm
@@ -25,40 +25,39 @@ use ND::Include;
use CGI qw/:standard/;
use ND::Web::Include;
-$ND::PAGES{check} = {parse => \&parse, process => \&process, render=> \&render};
+use base qw/ND::Web::XMLPage/;
-sub parse {
- my ($uri) = @_;
- #TODO: Improved apache conf needed
- #if ($uri =~ m{^/.*/((\d+)(?: |:)(\d+)(?:(?: |:)(\d+))?(?: |:(\d+))?)$}){
- # param('coords',$1);
- #}
-}
-
-sub process {
+$ND::Web::Page::PAGES{check} = __PACKAGE__;
+sub parse {
+ my $self = shift;
+ if ($self->{URI} =~ m{^/.*/((\d+)(?: |:)(\d+)(?:(?: |:)(\d+))?(?: |:(\d+))?)$}){
+ param('coords',$1);
+ }
}
-sub render {
- my ($DBH,$BODY) = @_;
- $ND::TEMPLATE->param(TITLE => 'Check planets and galaxies');
+sub render_body {
+ my $self = shift;
+ my ($BODY) = @_;
+ $self->{TITLE} = 'Check planets and galaxies';
+ my $DBH = $self->{DBH};
- $BODY->param(isBC => isMember() && (isOfficer() || isBC));
+ return $self->noAccess unless $self->{ATTACKER};
- return $ND::NOACCESS unless $ND::ATTACKER;
+ $BODY->param(isBC => $self->isMember && ($self->isOfficer || $self->isBC));
my ($x,$y,$z);
if (param('coords') =~ /(\d+)(?: |:)(\d+)(?:(?: |:)(\d+))?(?: |:(\d+))?/){
$x = $1;
$y = $2;
$z = $3;
- $BODY->param(Coords => param('coords'));
+ $BODY->param(Coords => "$x:$y".(defined $z ? ":$z" : ''));
}else{
$ND::ERROR .= p b q{Couldn't parse coords};
return $BODY;
}
- if (isMember() && param('cmd') eq 'arbiter'){
+ if ($self->isMember && param('cmd') eq 'arbiter'){
my $query = $DBH->prepare(q{SELECT count(*) AS friendlies FROM current_planet_stats WHERE x = ? AND y = ?
AND (planet_status IN ('Friendly','NAP') OR relationship IN ('Friendly','NAP'))});
my ($count) = $DBH->selectrow_array($query,undef,$x,$y);
@@ -74,47 +73,58 @@ sub render {
my $extra_columns = '';
$where = 'AND z = ?' if defined $z;
- if (isMember() && isOfficer()){
+ if ($self->isMember && $self->isOfficer){
$extra_columns = ",planet_status,hit_us, alliance,relationship,nick";
- }elsif (isMember() && isBC()){
+ }elsif ($self->isMember && $self->isBC){
$extra_columns = ", planet_status,hit_us, alliance,relationship";
}
- my $query = $DBH->prepare(qq{Select id,coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race, size, score, value, xp, sizerank, scorerank, valuerank, xprank, p.value - p.size*200 - coalesce(c.metal+c.crystal+c.eonium,0)/150 - coalesce(c.structures,(SELECT avg(structures) FROM covop_targets)::int)*1500 AS fleetvalue,(c.metal+c.crystal+c.eonium)/100 AS resvalue $extra_columns from current_planet_stats p LEFT OUTER JOIN covop_targets c ON p.id = c.planet where x = ? AND y = ? $where order by x,y,z asc});
+ my $query = $DBH->prepare(qq{Select id,coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race,
+ 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,
+ p.value - p.size*200 - coalesce(c.metal+c.crystal+c.eonium,0)/150 - coalesce(c.structures,(SELECT avg(structures) FROM covop_targets)::int)*1500 AS fleetvalue,(c.metal+c.crystal+c.eonium)/100 AS resvalue $extra_columns from current_planet_stats_full p LEFT OUTER JOIN covop_targets c ON p.id = c.planet where x = ? AND y = ? $where order by x,y,z asc});
if (defined $z){
$query->execute($x,$y,$z);
}else{
$query->execute($x,$y);
- if (isMember() && (isBC() || isOfficer()) && !isHC()){
+ if ($self->isMember && ($self->isBC || $self->isOfficer) && !$self->isHC){
log_message $ND::UID,"BC browsing $x:$y";
}
}
my @planets;
my $planet_id = undef;
my $i = 0;
- while (my ($id,$coords,$planet,$race,$size,$score,$value,$xp,$sizerank,$scorerank,$valuerank,$xprank
- ,$fleetvalue,$resvalue,$planet_status,$hit_us,$alliance,$relationship,$nick) = $query->fetchrow){
- $planet_id = $id;
- my %planet = (Coords => $coords, Planet => $planet, Race => $race, Size => "$size ($sizerank)"
- , Score => "$score ($scorerank)", Value => "$value ($valuerank)", XP => "$xp ($xprank)"
- , FleetValue => "$fleetvalue ($resvalue)");
- if (isMember() && (isOfficer() || isBC())){
- $planet{HitUs} = $hit_us;
- $planet{Alliance} = "$alliance ($relationship)";
- $planet{Nick} = "$nick ($planet_status)";
- $planet{PlanetStatus} = $planet_status;
- $planet{Relationship} = $relationship;
- $planet{isBC} = 1;
- if ($z && $alliance eq 'NewDawn'){
- log_message $ND::UID,"BC browsing ND planet $coords tick $ND::TICK";
+ while (my $planet = $query->fetchrow_hashref){
+ $planet_id = $planet->{id};
+ for my $type (qw/size score value xp/){
+ $planet->{"${type}img"} = 'stay';
+ $planet->{"${type}img"} = 'up' if $planet->{"${type}_gain_day"} > 0;
+ $planet->{"${type}img"} = 'down' if $planet->{"${type}_gain_day"} < 0;
+ $planet->{"${type}rankimg"} = 'stay';
+ $planet->{"${type}rankimg"} = 'up' if $planet->{"${type}rank_gain_day"} < 0;
+ $planet->{"${type}rankimg"} = 'down' if $planet->{"${type}rank_gain_day"} > 0;
+ for my $type ($type,"${type}_gain","${type}_gain_day"){
+ $planet->{$type} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000
+ }
+ }
+ if ($self->isMember && ($self->isOfficer || $self->isBC)){
+ if ($z && $planet->{alliance} eq 'NewDawn' && not ($self->isHC || $self->isOfficer)){
+ log_message $ND::UID,"BC browsing ND planet $planet->{coords} tick $self->{TICK}";
}
}
$i++;
- $planet{ODD} = $i % 2;
- push @planets,\%planet;
+ $planet->{ODD} = $i % 2;
+ delete $planet->{id};
+ push @planets,$planet;
}
- $BODY->param(Planets => \@planets);
+ $BODY->param(GPlanets => \@planets);
if ($z && $planet_id){
$BODY->param(OnePlanet => 1);
@@ -156,7 +166,15 @@ sub render {
$scan .= q{};
push @scans, {Scan => $scan};
- $query = $DBH->prepare(q{SELECT x,y,z,tick FROM planet_stats WHERE id = ?});
+ $query = $DBH->prepare(q{SELECT DISTINCT ON (type) type,scan_id, tick, scan FROM scans WHERE planet = ?
+ GROUP BY type,scan_id, tick, scan ORDER BY type,tick DESC});
+ $query->execute($planet_id);
+ my %scans;
+ while (my($type,$scan_id,$tick,$scan) = $query->fetchrow){
+ $scans{$type} = [$scan_id,$tick,$scan];
+ }
+
+ $query = $DBH->prepare(q{SELECT x,y,z,tick FROM planet_stats WHERE id = ? ORDER BY tick ASC});
$scan = q{
Previous Coords
| Tick | Value | Difference |
|---|
};
@@ -171,21 +189,15 @@ sub render {
}
}
$scan .= q{
};
+ $scan .= $scans{'Ship Classes'}->[2] if $scans{'Ship Classes'};
push @scans, {Scan => $scan};
- $query = $DBH->prepare(q{SELECT DISTINCT ON (type) type,scan_id, tick, scan FROM scans WHERE planet = ?
- GROUP BY type,scan_id, tick, scan ORDER BY type,tick DESC});
- $query->execute($planet_id);
- my %scans;
- while (my($type,$scan_id,$tick,$scan) = $query->fetchrow){
- $scans{$type} = [$scan_id,$tick,$scan];
- }
- for my $type ('Planet','Jumpgate','Unit','Military','Fleet Analysis','Surface Analysis','Technology Analysis','News'){
+ for my $type ('Planet','Jumpgate','Unit','Advanced Unit','Surface Analysis','Technology Analysis','Fleet Analysis','News'){
next unless exists $scans{$type};
my $scan_id = $scans{$type}->[0];
my $tick = $scans{$type}->[1];
my $scan = $scans{$type}->[2];
- if ($ND::TICK - $tick > 10){
+ if ($self->{TICK} - $tick > 10){
$scan =~ s{}{};
}
push @scans,{Scan => qq{
@@ -195,6 +207,46 @@ sub render {
$BODY->param(Scans => \@scans);
}
+ $query = $DBH->prepare(q{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)
+ AND x = $1 AND y = $2
+ });
+ $query->execute($x,$y) or $ND::ERROR .= p($DBH->errstr);
+
+ my @galaxies;
+ $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);
+
return $BODY;
}