From 8174fac466dde64437063677e2819d266c18a058 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Tue, 3 Aug 2010 21:16:18 +0200 Subject: [PATCH] Rename the shipname attribute --- database/shipname.sql | 1 + lib/NDWeb/Controller/Calls.pm | 2 +- lib/NDWeb/Controller/Raids.pm | 2 +- scripts/stats.pl | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 database/shipname.sql diff --git a/database/shipname.sql b/database/shipname.sql new file mode 100644 index 0000000..7a6144f --- /dev/null +++ b/database/shipname.sql @@ -0,0 +1 @@ +ALTER TABLE ship_stats RENAME COLUMN name TO ship; diff --git a/lib/NDWeb/Controller/Calls.pm b/lib/NDWeb/Controller/Calls.pm index 0ba04a5..dac7f32 100644 --- a/lib/NDWeb/Controller/Calls.pm +++ b/lib/NDWeb/Controller/Calls.pm @@ -161,7 +161,7 @@ WITH lc AS ( SELECT fid,(sum(amount*(metal+crystal+eonium)) / value)::int AS value_ratio FROM lcp JOIN fleet_ships fs USING (fid) - JOIN ship_stats s ON s.name = fs.ship + JOIN ship_stats s USING (ship) GROUP BY fid, value ) SELECT DISTINCT ON (x,y,z,pid,name,amount,back) fid,mission, name, eta diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm index b756d56..781f4c1 100644 --- a/lib/NDWeb/Controller/Raids.pm +++ b/lib/NDWeb/Controller/Raids.pm @@ -667,7 +667,7 @@ sub calcredir : Private { ); my $ships = $dbh->prepare(q{ -SELECT id, amount FROM fleet_ships fs JOIN ship_stats s ON s.name = fs.ship +SELECT id, amount FROM fleet_ships fs JOIN ship_stats s USING (ship) WHERE fid = $1 }); diff --git a/scripts/stats.pl b/scripts/stats.pl index 5b7d6a2..f90f16a 100755 --- a/scripts/stats.pl +++ b/scripts/stats.pl @@ -40,7 +40,7 @@ my %classes = (Fighter => 'Fi', Corvette => 'Co', Frigate => 'Fr', Destroyer => my $file = get("http://game.planetarion.com/manual.pl?page=stats"); $dbh->begin_work; -my $st = $dbh->prepare(q{INSERT INTO ship_stats (name,"class",t1,t2,t3,"type",init,guns,armor,damage,eres,metal,crystal,eonium,race) VALUES(?,?,NULLIF(?,'-'),NULLIF(?,'-'),NULLIF(?,'-'),?,?,?,?,?,?,?,?,?,?)}); +my $st = $dbh->prepare(q{INSERT INTO ship_stats (ship,"class",t1,t2,t3,"type",init,guns,armor,damage,eres,metal,crystal,eonium,race) VALUES(?,?,NULLIF(?,'-'),NULLIF(?,'-'),NULLIF(?,'-'),?,?,?,?,?,?,?,?,?,?)}); while ($file =~ /((?:\w| )+)<\/td>(\w+)<\/td>(\w+|-)<\/td>(\w+|-)<\/td>(\w+|-)<\/td>(\w+)\D+(\d+)\D+(\d+)\D+(\d+)\D+?(\d+|-)\D+(\d+)\D+(\d+)\D+(\d+)\D+(\d+)\D+\d+\D+\d+.+?(\w+)<\/td>/g){ my $dmg = $10; $dmg = 0 if $dmg eq '-'; -- 2.39.2