X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=inline;f=NDWeb%2FPages%2FRaids.pm;h=0b342fa42022547358865b52e8d680c91cd0f222;hb=fb2bbffe375681514dff83be2f9ed25e0d54bde3;hp=139b76204e6351f9b9e3059c2148248f5ec1b12b;hpb=a074bd17f5e8ba341a22bbfca1da7093b8351774;p=ndwebbie.git diff --git a/NDWeb/Pages/Raids.pm b/NDWeb/Pages/Raids.pm index 139b762..0b342fa 100644 --- a/NDWeb/Pages/Raids.pm +++ b/NDWeb/Pages/Raids.pm @@ -192,10 +192,18 @@ sub render_body { } $BODY->param(Message => parseMarkup($raid->{message})); $BODY->param(LandingTick => $raid->{tick}); - my $targetquery = $DBH->prepare(qq{SELECT r.id, r.planet, size, score, value, p.x,p.y,p.z, race, 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, comment + my $targetquery = $DBH->prepare(qq{SELECT r.id, r.planet, size, score, value + , p.x,p.y,p.z, race + , 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 + ,(metal+crystal+eonium)/100 AS resvalue, comment FROM current_planet_stats p JOIN raid_targets r ON p.id = r.planet - LEFT OUTER JOIN covop_targets c ON p.id = c.planet + LEFT OUTER JOIN planet_scans ps ON p.id = ps.planet + LEFT OUTER JOIN structure_scans ss ON p.id = ss.planet WHERE r.raid = ? $noingal ORDER BY size}); @@ -227,30 +235,42 @@ sub render_body { } $target{comment} = parseMarkup($target->{comment}) if ($target->{comment}); - my $scans = $DBH->prepare(q{SELECT DISTINCT ON (type) type, tick, scan FROM scans - WHERE planet = ? AND type ~ 'Unit|Planet|Advanced Unit|.* Analysis' AND tick + 24 > tick() AND scan is not null - GROUP BY type, tick, scan ORDER BY type ,tick DESC}); - $scans->execute($target->{planet}); - my %scans; - while (my $scan = $scans->fetchrow_hashref){ - $scans{$scan->{type}} = $scan; - } - - my @scans; - for my $type ('Planet','Unit','Advanced Unit','Surface Analysis','Technology Analysis'){ - next unless exists $scans{$type}; - my $scan = $scans{$type}; - if ($self->{TICK} - $scan->{tick} > 5){ - $scan->{scan} =~ s{