X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fdb-idempotent-populate;fp=pctb%2Fdb-idempotent-populate;h=b7743ed9cb1ff3f78ef9b6be379d4635ec467e1e;hp=66fd6f5e380a2879948fb61ed04b6051440b7ef8;hb=4082d99f96937ee23634130df98a376f1643086b;hpb=a5ec88cc0c003b52afa18af3a97242fe891501b8

diff --git a/pctb/db-idempotent-populate b/pctb/db-idempotent-populate
index 66fd6f5..b7743ed 100755
--- a/pctb/db-idempotent-populate
+++ b/pctb/db-idempotent-populate
@@ -31,35 +31,23 @@ use strict (qw(vars));
 use DBI;
 
 use Commods;
+use CommodsDatabase;
 
 @ARGV==1 or die;
 my ($oceanname) = @ARGV;
 
-my $dbfn= "OCEAN-$oceanname.db";
-
-our $dbh;
-
-sub dbdoall ($) {
-    foreach my $cmd (split /\;/, $_[0]) {
-	$dbh->do("$cmd;") if $cmd =~ m/\S/;
-    }
-}
-
 #---------- setup ----------
 
 parse_masters_ocean($oceanname);
 our $ocean= $oceans{$oceanname};
 
-$dbh= DBI->connect("dbi:SQLite:$dbfn",'','',
-		   { AutoCommit=>0,
-		     RaiseError=>1, ShowErrorStatement=>1,
-		     unicode=>1 })
-    or die "$dbfn $DBI::errstr ?";
+db_setocean($oceanname);
+db_connect();
 
 #---------- schema ----------
 
 foreach my $bs (qw(buy sell)) {
-    dbdoall(<<END)
+    db_doall(<<END)
  CREATE TABLE IF NOT EXISTS $bs (
 	commodid	INTEGER			NOT NULL,
 	islandid	INTEGER			NOT NULL,
@@ -74,7 +62,7 @@ END
     ;
 }
 
-dbdoall(<<END)
+db_doall(<<END)
  CREATE TABLE IF NOT EXISTS commods (
 	commodid	INTEGER	PRIMARY KEY AUTOINCREMENT NOT NULL,
 	commodname	TEXT	UNIQUE		NOT NULL,
@@ -199,7 +187,7 @@ END
 	distance_propagate_now(@$ref);
     }
 
-    dbdoall(<<END)
+    db_doall(<<END)
  DELETE FROM dists;
 END
     ;