while ($coords =~ m/(\d+:\d+:\d+)/g){
push @coords,$1;
}
- my $planets = $dbh->prepare(q{SELECT id,coords(x,y,z), alliance
+ my $planets = $dbh->prepare(q{SELECT id,coords(x,y,z), alliance, nick
FROM current_planet_stats p
WHERE coords(x,y,z) = ANY($1)
ORDER BY alliance, p.x, p.y, p.z
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)}
,undef,$1,$2,$3,$4);
$c->res->redirect($c->uri_for('planet',$planet));
+ }else{
+ 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);
+ }
}
}
FROM users u
JOIN groupmembers gm USING (uid)
LEFT OUTER JOIN (SELECT DISTINCT ON (planet) planet,tick from scans where type = 'News' ORDER BY planet,tick DESC) n USING (planet)
- LEFT OUTER JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
+ LEFT OUTER JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r
JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target
my $query = $dbh->prepare(q{
SELECT coords(t.x,t.y,t.z), i.eta, i.tick, rt.id AS ndtarget, rc.launched, inc.landing_tick
FROM users u
- LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
+ LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r
JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target
$query = $dbh->prepare(q{
SELECT coords(t.x,t.y,t.z),t.alliance_id, t.alliance, i.eta, i.tick, i.ingal
FROM users u
- JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
+ JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
WHERE u.uid = $1 AND (i.mission = 'Defend' OR i.mission = 'AllyDef')
ORDER BY (i.tick - i.eta)
,ruler, p.planet,race, size, score, value
, xp, sizerank, scorerank, valuerank, xprank, 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, planet_status,hit_us
, alliance,relationship,nick
FROM current_planet_stats p
LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet
- LEFT OUTER JOIN current_structure_scans ss ON p.id = ss.planet
+ LEFT OUTER JOIN current_development_scans ds ON p.id = ds.planet
WHERE planet_status IN ('Friendly','NAP') order by x,y,z asc
});
$query->execute;