X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fdb-idempotent-populate;h=c4bd4a761431ef4968520b0080e894925871f73f;hp=69703a6745e1bcf7b7365ac50fd021dbe9f9580c;hb=9140d5a3e99e6b98d3f792cb1f82e4d7a0e116d7;hpb=062f9c87d921e901c1daf85a3e602e7e4c9a0cb4

diff --git a/yarrg/db-idempotent-populate b/yarrg/db-idempotent-populate
index 69703a6..c4bd4a7 100755
--- a/yarrg/db-idempotent-populate
+++ b/yarrg/db-idempotent-populate
@@ -5,7 +5,7 @@
 #
 # usage: ./db-idempotent-populate <Oceanname>
 #  creates or updates OCEAN-Oceanname.db
-#  from master-master.txt
+#  from source-info.txt
 
 # This is part of ypp-sc-tools, a set of third-party tools for assisting
 # players of Yohoho Puzzle Pirates.
@@ -42,8 +42,6 @@ my ($oceanname) = @ARGV;
 #---------- setup ----------
 
 parse_info_serverside();
-parse_info_serverside_ocean($oceanname);
-our $ocean= $oceans{$oceanname};
 
 db_setocean($oceanname);
 db_writer();
@@ -104,6 +102,13 @@ db_doall(<<END)
 	dist		INTEGER			NOT NULL,
 	PRIMARY KEY (aiid, biid)
  );
+ CREATE TABLE IF NOT EXISTS vessels (
+	name		TEXT			NOT NULL,
+	mass		INTEGER			NOT NULL,
+	volume		INTEGER			NOT NULL,
+	shot		INTEGER			NOT NULL,
+	PRIMARY KEY (name)
+ );
 END
     ;
 
@@ -138,8 +143,20 @@ END
     $dbh->commit;
 }
 
-#---------- island list ----------
-#---------- routes ----------
-# now done by yppedia-chart-parser
-
-__DATA__
+#---------- vessel types ----------
+{
+    my $idempotent= $dbh->prepare(<<'END')
+ INSERT OR REPLACE INTO vessels (name, shot, mass, volume)
+                         VALUES (?,?,?,?)
+END
+    ;
+    foreach my $name (sort keys %vessels) {
+	my $v= $vessels{$name};
+	my $shotdamage= $shotname2damage{$v->{Shot}};
+	die "no shot damage for shot $v->{Shot} for vessel $name"
+	    unless defined $shotdamage;
+	my @qa= ($name, $shotdamage, map { $v->{$_} } qw(Mass Volume));
+	$idempotent->execute(@qa);
+    }
+    $dbh->commit;
+}