--- /dev/null
+DROP VIEW planet_scans;
+DROP VIEW structure_scans;
+
+CREATE TABLE planet_scans (
+ id integer PRIMARY KEY REFERENCES scans(id),
+ planet integer NOT NULL REFERENCES planets(id),
+ tick integer NOT NULL,
+ metal bigint NOT NULL,
+ crystal bigint NOT NULL,
+ eonium bigint NOT NULL,
+ hidden bigint NOT NULL,
+ metal_roids integer NOT NULL,
+ crystal_roids integer NOT NULL,
+ eonium_roids integer NOT NULL,
+ agents integer NOT NULL,
+ guards integer NOT NULL,
+ light TEXT NOT NULL,
+ medium TEXT NOT NULL,
+ heavy TEXT NOT NULL
+);
+
+
+CREATE TABLE structure_scans (
+ id integer PRIMARY KEY REFERENCES scans(id),
+ planet integer NOT NULL REFERENCES planets(id),
+ tick integer NOT NULL,
+ light_fac integer NOT NULL,
+ medium_fac integer NOT NULL,
+ heavy_fac integer NOT NULL,
+ amps integer NOT NULL,
+ distorters integer NOT NULL,
+ metal_ref integer NOT NULL,
+ crystal_ref integer NOT NULL,
+ eonium_ref integer NOT NULL,
+ reslabs integer NOT NULL,
+ fincents integer NOT NULL,
+ seccents integer NOT NULL,
+ total integer NOT NULL
+);
+
+CREATE TABLE tech_scans (
+ id integer PRIMARY KEY REFERENCES scans(id),
+ planet integer NOT NULL REFERENCES planets(id),
+ tick integer NOT NULL,
+ travel integer NOT NULL,
+ infra integer NOT NULL,
+ hulls integer NOT NULL,
+ waves integer NOT NULL,
+ extraction integer NOT NULL,
+ covert integer NOT NULL,
+ mining integer NOT NULL
+);
+
+CREATE OR REPLACE VIEW current_planet_scans AS
+SELECT DISTINCT ON (planet) ps.*
+FROM planet_scans ps
+ORDER BY planet, tick DESC, id DESC;
+
+CREATE OR REPLACE VIEW current_structure_scans AS
+SELECT DISTINCT ON (planet) ss.*
+FROM structure_scans ss
+ORDER BY planet, tick DESC, id DESC;
+
+CREATE OR REPLACE VIEW current_tech_scans AS
+SELECT DISTINCT ON (planet) ts.*
+FROM tech_scans ts
+ORDER BY planet, tick DESC, id DESC;
+
+CREATE INDEX planet_scans_planet_index ON planet_scans(planet,tick);
+CREATE INDEX structure_scans_planet_index ON structure_scans(planet,tick);
+CREATE INDEX tech_scans_planet_index ON tech_scans(planet,tick);
+
+DROP TABLE planet_data;
+DROP TABLE planet_data_types;
,((s.size::int8*(1400-tick())*250)/100 + score + (resources/planets*scoremem)/300
+ (hidden/planets*scoremem)/100)::bigint AS nscore3
,(s.size::int8*(1400-tick())*250)/100 AS scoregain3
- FROM (SELECT alliance_id AS id,sum(metal+crystal+eonium) AS resources, sum(hidden) AS hidden, count(*) AS planets
- FROM planets p join planet_scans c ON p.id = c.planet GROUP by alliance_id) r
- NATURAL JOIN alliances a
+ FROM (SELECT alliance_id AS id,sum(metal+crystal+eonium) AS resources
+ , sum(hidden) AS hidden, count(*) AS planets
+ FROM planets p join current_planet_scans c ON p.id = c.planet
+ GROUP by alliance_id
+ ) r
+ NATURAL JOIN alliances a
LEFT OUTER JOIN (SELECT *,LEAST(members,60) AS scoremem FROM alliance_stats
WHERE tick = (SELECT max(tick) FROM alliance_stats)) s ON a.id = s.id
ORDER BY $order
,(SELECT value FROM current_planet_stats WHERE id = ?)) AS MaxResHack
, planet_status, relationship,gov
FROM current_planet_stats 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_planet_scans ps ON p.id = ps.planet
+ LEFT OUTER JOIN current_structure_scans ss ON p.id = ss.planet
) AS foo
LEFT OUTER JOIN (SELECT id,max(tick) AS tick FROM covop_attacks GROUP BY id) co USING (id)
WHERE (metal IS NOT NULL OR seccents IS NOT NULL)
,(metal+crystal+eonium)/100 AS resvalue, planet_status,hit_us
, alliance,relationship,nick
FROM current_planet_stats 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_planet_scans ps ON p.id = ps.planet
+ LEFT OUTER JOIN current_structure_scans ss ON p.id = ss.planet
WHERE planet_status IN ('Friendly','NAP') order by x,y,z asc
});
$query->execute;
$c->stash(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(ps.metal+ps.crystal+ps.eonium,0)/150 -
+ , 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
, hidden, light, medium, heavy
- FROM current_planet_stats p
- JOIN raid_targets r ON p.id = r.planet
- LEFT OUTER JOIN planet_scans ps ON p.id = ps.planet
- LEFT OUTER JOIN structure_scans ss ON p.id = ss.planet
+ FROM current_planet_stats p
+ JOIN raid_targets r ON p.id = r.planet
+ LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet
+ LEFT OUTER JOIN current_structure_scans ss ON p.id = ss.planet
WHERE r.raid = ?
$noingal
ORDER BY size});
};
}
- $query = $dbh->prepare(qq{SELECT p.id,coords(x,y,z), ruler, p.planet,race,
+ $query = $dbh->prepare(qq{SELECT DISTINCT ON (x,y,z,p.id)
+ p.id,coords(x,y,z), ruler, p.planet,race,
size, size_gain, size_gain_day,
score,score_gain,score_gain_day,
value,value_gain,value_gain_day,
valuerank,valuerank_gain,valuerank_gain_day,
xprank,xprank_gain,xprank_gain_day
$extra_columns
- FROM current_planet_stats_full p
+ 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
- WHERE x = ? AND y = ? AND COALESCE(z = ?,TRUE) ORDER BY x,y,z ASC
+ 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
});
$query->execute($x,$y,$z);
}
if ($c->check_user_roles(qw/stats_planetdata/)){
- my $query = $dbh->prepare(q{SELECT DISTINCT ON(rid) tick,category,name,amount
- FROM planet_data pd JOIN planet_data_types pdt ON pd.rid = pdt.id
- WHERE pd.id = $1 ORDER BY rid,tick DESC
- });
- $query->execute($id);
- $c->stash(planetdata => $query->fetchall_arrayref({}) );
+ $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));
}
my $query = $dbh->prepare(q{SELECT value,value_gain AS gain,tick FROM planet_stats
[% META title = 'Planet stats' %]
[% PROCESS inc/stats.tt2 %]
-[% IF planetdata %]
<div class="leftinfo">
-<table>
- <tr><th>Tick</th><th>Type</th><th>Amount</th></tr>
- [% FOR pd IN planetdata %]
- <tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
- <td>[% pd.tick %]</td>
- <td>[% pd.category %] [% pd.name %]</td>
- <td>[% comma(pd.amount) %]</td>
+[% IF planetscan.tick %]
+<table [% IF planetscan.tick < TICK - 24 %] class="old"[% END %]>
+ <tr><th>Tick:</th><td>[% planetscan.tick %]</td></tr>
+ <tr><th>Type</th><th>Roids</th><th>Resources</th></tr>
+ <tr align="right"><td align="left">Metal</td>
+ <td>[% planetscan.metal_roids %]</td>
+ <td>[% comma(planetscan.metal) %]</td>
+ </tr>
+ <tr align="right"><td align="left">Crystal</td>
+ <td>[% planetscan.crystal_roids %]</td>
+ <td>[% comma(planetscan.crystal) %]</td>
+ </tr>
+ <tr align="right"><td align="left">Eonium</td>
+ <td>[% planetscan.eonium_roids %]</td>
+ <td>[% comma(planetscan.eonium) %]</td>
+ </tr>
+ <tr><th>Agents</th><th><th>Guards</th></tr>
+ <tr align="right"><td>[% planetscan.agents %]</td>
+ <td></td><td>[% planetscan.guards %]</td>
+ </tr>
+ <tr><th colspan="3">Factory production</th></tr>
+ <tr><th>Light</th><th>Medium</th><th>Heavy</th></tr>
+ <tr align="right"><td>[% planetscan.light %]</td>
+ <td>[% planetscan.medium %]</td><td>[% planetscan.heavy %]</td>
+ </tr>
+ <tr><th>Hidden:</th><td colspan="2" align="right">[% comma(planetscan.hidden) %]</td></tr>
+</table>
+[% END %]
+[% IF structurescan.tick %]
+<table [% IF structurescan.tick < TICK - 24 %] class="old"[% END %]>
+ <tr><th>Tick:</th><td>[% structurescan.tick %]</td></tr>
+ <tr><th colspan="3">Factories</th></tr>
+ <tr><th>Light</th><th>Medium</th><th>Heavy</th></tr>
+ <tr align="right"><td>[% structurescan.light_fac %]</td>
+ <td>[% structurescan.medium_fac %]</td>
+ <td>[% structurescan.heavy_fac %]</td>
+ </tr>
+ <tr><th>Amps</th><th></th><th>Distorters</th></tr>
+ <tr align="right"><td>[% structurescan.amps %]</td>
+ <td></td>
+ <td>[% structurescan.distorters %]</td>
+ </tr>
+ <tr><th colspan="3">Refinaries</th></tr>
+ <tr><th>Metal</th><th>Crystal</th><th>Eonium</th></tr>
+ <tr align="right"><td>[% structurescan.metal_ref %]</td>
+ <td>[% structurescan.crystal_ref %]</td>
+ <td>[% structurescan.eonium_ref %]</td>
+ </tr>
+ <tr><th>Reslabs</th><th>Finance</th><th>Seccents</th></tr>
+ <tr align="right"><td>[% structurescan.reslabs %]</td>
+ <td>[% structurescan.fincents %]</td>
+ <td>[% structurescan.seccents %]</td>
+ </tr>
+</table>
+[% END %]
+[% IF techscan.tick %]
+<table [% IF techscan.tick < TICK - 24 %] class="old"[% END %]>
+ <tr><th>Tick:</th><td>[% techscan.tick %]</td></tr>
+ <tr><th>Research</th><th>Level</th></tr>
+ <tr><td>Travel Time</td>
+ <td align="right">[% techscan.travel %]</td>
+ </tr>
+ <tr><td>Infrastructure</td>
+ <td align="right">[% techscan.infra %]</td>
+ </tr>
+ <tr><td>Hulls</td>
+ <td align="right">[% techscan.hulls %]</td>
+ </tr>
+ <tr><td>Waves</td>
+ <td align="right">[% techscan.waves %]</td>
+ </tr>
+ <tr><td>Core Extraction</td>
+ <td align="right">[% techscan.extraction %]</td>
+ </tr>
+ <tr><td>Covert Ops</td>
+ <td align="right">[% techscan.covert %]</td>
+ </tr>
+ <tr><td>Mining</td>
+ <td align="right">[% techscan.mining %]</td>
</tr>
- [% END %]
</table>
-</div>
[% END %]
+</div>
<div class="leftinfo">
<table>
<tr><th>Tick</th><th>Value</th><th>Gain</th></tr>
my $addfleet = $dbh->prepare(q{INSERT INTO fleets (name,mission,sender,target,tick,eta,back,amount,ingal,uid) VALUES(?,?,?,?,?,?,?,?,?,-1) RETURNING id});
my $fleetscan = $dbh->prepare(q{INSERT INTO fleet_scans (id,scan) VALUES(?,?)});
my $addships = $dbh->prepare(q{INSERT INTO fleet_ships (id,ship,amount) VALUES(?,?,?)});
-my $addpdata = $dbh->prepare(q{INSERT INTO planet_data (id,tick,scan,rid,amount) VALUES(?,?,?,(SELECT id FROM planet_data_types WHERE category = ? AND name = ?), ?)});
+my $addplanetscan = $dbh->prepare(q{INSERT INTO planet_scans
+ (id,tick,planet,metal_roids,metal,crystal_roids,crystal,eonium_roids,eonium
+ ,agents,guards,light,medium,heavy,hidden)
+ VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)});
+my $addstrucscan = $dbh->prepare(q{INSERT INTO structure_scans
+ (id,tick,planet,light_fac,medium_fac,heavy_fac,amps,distorters
+ ,metal_ref,crystal_ref,eonium_ref,reslabs,fincents,seccents,total)
+ VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)});
+
+my $addtechscan = $dbh->prepare(q{INSERT INTO tech_scans
+ (id,tick,planet,travel,infra,hulls,waves,extraction,covert,mining)
+ VALUES(?,?,?,?,?,?,?,?,?,?)});
+
$dbh->begin_work or die 'No transaction';
$newscans->execute or die $dbh->errstr;
$dbh->pg_savepoint('scans') or die "No savepoint";
-my %production = (None => 0, Low => 35, Medium => 65, High => 100);
while (my $scan = $newscans->fetchrow_hashref){
$dbh->pg_release('scans') or die "Couldn't save";
$dbh->pg_savepoint('scans') or die "Couldn't save";
#TODO: something about planet being closed?
}
if ($type eq 'Planet'){
+ my @values = ($scan->{id},$tick,$planet);
+ $file =~ s/(\d),(\d)/$1$2/g;
+
while($file =~ m/"center">(Metal|Crystal|Eonium)\D+(\d+)\D+([\d,]+)/g){
- my ($type,$roids,$res) = ($1,$2,$3);
- $roids =~ s/,//g;
- $addpdata->execute($planet,$tick,$scan->{id}
- ,'roid',$type, $roids) or die $dbh->errstr;
- $res =~ s/,//g;
- $addpdata->execute($planet,$tick,$scan->{id}
- ,'resource',$type, $res) or die $dbh->errstr;
+ push @values,$2,$3;
}
if($file =~ m{Security\ Guards .+? "center">(\d+)</td>
.+? "center">(\d+)</td>}sx){
- $addpdata->execute($planet,$tick,$scan->{id}
- ,'planet','Agents', $1) or die $dbh->errstr;
- $addpdata->execute($planet,$tick,$scan->{id}
- ,'planet','Security Guards', $2) or die $dbh->errstr;
+ push @values,$1,$2;
}
if($file =~ m{<td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td>}){
- $addpdata->execute($planet,$tick,$scan->{id}
- ,'planet','Light Usage', $production{$1}) or die $dbh->errstr;
- $addpdata->execute($planet,$tick,$scan->{id}
- ,'planet','Medium Usage', $production{$2}) or die $dbh->errstr;
- $addpdata->execute($planet,$tick,$scan->{id}
- ,'planet','Heavy Usage', $production{$3}) or die $dbh->errstr;
+ push @values,$1,$2,$3;
}
if($file =~ m{<span class="superhighlight">([\d,]+)</span>}){
- my $res = $1;
- $res =~ s/,//g;
- $addpdata->execute($planet,$tick,$scan->{id}
- ,'planet','Production', $res) or die $dbh->errstr;
+ push @values,$1;
}
+ $addplanetscan->execute(@values);
}elsif ($type eq 'Jumpgate'){
#print "$file\n";
while ($file =~ m{(\d+):(\d+):(\d+)\D+(Attack|Defend|Return)</td><td class="left">([^<]*)\D+(\d+)\D+(\d+)}g){
$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
}
}
- } elsif($type eq 'Surface Analysis' || $type eq 'Technology Analysis'){
- my $cat = ($type eq 'Surface Analysis' ? 'struc' : 'tech');
+ } elsif($type eq 'Surface Analysis'){
+ my @values = ($scan->{id},$tick,$planet);
+ my $total = 0;
while($file =~ m{((?:[a-zA-Z]| )+)</t[dh]><td(?: class="right")?>(\d+)}sg){
- $addpdata->execute($planet,$tick,$scan->{id}
- ,$cat,$1, $2) or die $dbh->errstr;
+ push @values,$2;
+ $total += $2;
}
-
+ push @values,$total;
+ $addstrucscan->execute(@values);
+ } elsif($type eq 'Technology Analysis'){
+ my @values = ($scan->{id},$tick,$planet);
+ while($file =~ m{((?:[a-zA-Z]| )+)</t[dh]><td(?: class="right")?>(\d+)}sg){
+ push @values,$2;
+ }
+ $addtechscan->execute(@values);
} elsif($type eq 'Unit' || $type eq 'Advanced Unit'){
my $id = addfleet($type,'Full fleet',$file,$planet,undef,$tick,undef,undef,undef);
$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
projects / ndwebbie.git / commitdiff