});
$query->execute($x,$y);
- $c->stash(g => $query->fetchrow_hashref );
+ my $g = $query->fetchrow_hashref;
+ $c->detach('/default') unless $g;
+ $c->stash(g => $g);
+
my $extra_columns = '';
if ($c->check_user_roles(qw/stats_intel/)){
$extra_columns .= q{
,gov, p.value - p.size*200 -
COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150 -
- COALESCE(ss.total ,(SELECT COALESCE(avg(total),0)
- FROM structure_scans)::int)*1500 AS fleetvalue
+ COALESCE(ds.total ,(SELECT COALESCE(avg(total),0)
+ FROM current_development_scans)::int)*1500 AS fleetvalue
,(metal+crystal+eonium)/100 AS resvalue
};
}
$extra_columns
FROM current_planet_stats_full p
LEFT OUTER JOIN planet_scans ps ON p.id = ps.planet
- LEFT OUTER JOIN structure_scans ss ON p.id = ss.planet
+ LEFT OUTER JOIN current_development_scans ds ON p.id = ds.planet
WHERE x = ? AND y = ? AND COALESCE(z = ?,TRUE)
- ORDER BY x,y,z,p.id,ps.tick DESC, ps.id DESC, ss.tick DESC, ss.id DESC
+ ORDER BY x,y,z,p.id,ps.tick DESC, ps.id DESC, ds.tick DESC, ds.id DESC
});
$query->execute($x,$y,$z);
my $p = $dbh->selectrow_hashref(q{SELECT id,x,y,z FROM current_planet_stats
WHERE id = $1},undef,$id);
+ $c->detach('/default') unless $p;
+
$c->forward('galaxy',[$p->{x},$p->{y},$p->{z}]);
$c->stash(p => $p);
if ($c->check_user_roles(qw/stats_missions/)){
my $query = $dbh->prepare(q{
- SELECT DISTINCT ON (i.tick,x,y,z,t.id,i.name,i.amount) i.id,i.mission, i.name, i.tick, i.eta AS eta
- , i.amount, coords(x,y,z) AS coords, t.id AS planet
- FROM ((
- SELECT * FROM fleets
- WHERE sender = $1 AND tick > tick() - 14
- ) UNION (
- SELECT * FROM fleets WHERE sender = $1 AND mission = 'Full fleet'
- ORDER BY tick DESC LIMIT 5
- )
- ) i
- LEFT OUTER JOIN (planets
- NATURAL JOIN planet_stats) t ON i.target = t.id
- AND t.tick = ( SELECT MAX(tick) FROM planet_stats)
- WHERE i.uid = -1
- ORDER BY i.tick,x,y,z,t.id,i.name,i.amount,i.eta
- });
+(
+ SELECT DISTINCT ON (mission,name) fid,mission,name,tick, NULL AS eta
+ ,amount, NULL AS coords, planet, NULL AS back
+ FROM fleets f
+ WHERE planet = $1 AND tick <= tick() AND (
+ fid IN (SELECT fid FROM fleet_scans)
+ ) AND (
+ mission = 'Full fleet'
+ OR tick >= tick() - 12
+ )
+ ORDER BY mission,name,tick DESC
+) UNION (
+ SELECT DISTINCT ON (tick,x,y,z,mission,name,amount)
+ NULL as fid, i.mission, i.name, i.tick,eta
+ , i.amount, coords(x,y,z), t.id AS planet, back
+ FROM intel i
+ LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
+ WHERE uid = -1 AND i.sender = $1 AND i.tick > tick() - 14 AND i.tick < tick() + 14
+ ORDER BY i.tick,x,y,z,mission,name,amount,back
+)
+ });
$query->execute($id);
my $ships = $dbh->prepare(q{SELECT ship,amount FROM fleet_ships
- WHERE id = ? ORDER BY num
+ WHERE fid = ? ORDER BY num
});
my @missions;
while (my $mission = $query->fetchrow_hashref){
my @ships;
- $ships->execute($mission->{id});
- if ($ships->rows != 0){
+ if ($mission->{fid}){
+ $ships->execute($mission->{fid});
while (my $ship = $ships->fetchrow_hashref){
push @ships,$ship;
}
+ push @ships, {ship => 'No', amount => 'ships'} if @ships == 0;
$mission->{ships} = \@ships;
}
push @missions,$mission;
$query = $dbh->prepare(q{
SELECT DISTINCT ON (i.tick,x,y,z,s.id,i.name,i.amount) i.id,i.mission, i.name, i.tick,eta
, i.amount, coords(x,y,z) AS coords, s.id AS planet
- FROM fleets i
+ FROM intel i
LEFT OUTER JOIN (planets
NATURAL JOIN planet_stats) s ON i.sender = s.id
AND s.tick = ( SELECT MAX(tick) FROM planet_stats)
if ($c->check_user_roles(qw/stats_planetdata/)){
$c->stash(planetscan => $dbh->selectrow_hashref(q{SELECT *
FROM current_planet_scans WHERE planet = $1},undef,$id));
- $c->stash(structurescan => $dbh->selectrow_hashref(q{SELECT *
- FROM current_structure_scans WHERE planet = $1},undef,$id));
- $c->stash(techscan => $dbh->selectrow_hashref(q{SELECT *
- FROM current_tech_scans WHERE planet = $1},undef,$id));
+ $c->stash(devscan => $dbh->selectrow_hashref(q{SELECT *
+ FROM current_development_scans WHERE planet = $1},undef,$id));
}
my $query = $dbh->prepare(q{SELECT value,value_gain AS gain,tick FROM planet_stats
my $dbh = $c->model;
local $_ = $find || $c->req->param('coords');
+ $c->stash(searchterm => $_);
if (/(\d+)(?: |:)(\d+)(?: |:)(\d+)(?:(?: |:)(\d+))?/){
my $planet = $dbh->selectrow_array(q{SELECT planetid($1,$2,$3,$4)}
$c->res->redirect($c->uri_for('planet',$planet));
}elsif (/(\d+)(?: |:)(\d+)/){
$c->res->redirect($c->uri_for('galaxy',$1,$2));
+ }elsif($c->check_user_roles(qw/stats_find_nick/)) {
+ my $query = $dbh->prepare(q{SELECT id,coords(x,y,z),nick
+ FROM current_planet_stats p
+ WHERE nick ilike $1
+ });
+ $query->execute($_);
+ my $planets = $query->fetchall_arrayref({});
+ if (@{$planets} == 1){
+ $c->res->redirect($c->uri_for('planet',$planets->[0]->{id}));
+ }else{
+ $c->stash(planets => $planets);
+ }
}
-
}
projects / ndwebbie.git / blobdiff