X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2FCommodsDatabase.pm;h=c72bc2dffb9663f08c2d160157d9b785c71cbe2a;hp=7bd7c77e1191055137e9b7fa43b45d2bec08263c;hb=8ee07d9a86ecdf73fd959ae88173b176cdac2305;hpb=4c157b676894d03718be0395900162acea4f1ff3

diff --git a/yarrg/CommodsDatabase.pm b/yarrg/CommodsDatabase.pm
index 7bd7c77..c72bc2d 100644
--- a/yarrg/CommodsDatabase.pm
+++ b/yarrg/CommodsDatabase.pm
@@ -45,22 +45,38 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&db_setocean &db_writer &db_connect $dbh
 		      &db_filename &db_doall &db_onconflict
-		      &db_setdatadir $db_datadir);
+		      &dbr_filename &dbr_connect &db_connect_core);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
 }
 
+sub dbr_filename ($$) {
+    my ($datadir,$oceanname) = @_;
+    return "$datadir/OCEAN-$oceanname.db";
+}
+sub dbr_connect ($$) {
+    my ($datadir,$ocean) = @_;
+    return connect_core(dbr_filename($datadir,$ocean));
+}
+
+sub db_connect_core ($) {
+    my ($fn)= @_;
+    my $h= DBI->connect("dbi:SQLite:$fn",'','',
+		       { AutoCommit=>0,
+			 RaiseError=>1, ShowErrorStatement=>1,
+			 unicode=>1 })
+	or die "$fn $DBI::errstr ?";
+    return $h;
+    # default timeout is 30s which is plenty
+}
+
 our $dbfn;
 our $dbh;
-our $db_datadir= '.';
 
-sub db_setdatadir ($) {
-    $db_datadir= $_[0];
-}
 sub db_setocean ($) {
     my ($oceanname) = @_;
-    $dbfn= "$db_datadir/OCEAN-$oceanname.db";
+    $dbfn= dbr_filename('.',$oceanname);
 }
 sub db_filename () {
     return $dbfn;
@@ -94,12 +110,7 @@ sub db_writer () {
 }
 
 sub db_connect () {
-    $dbh= DBI->connect("dbi:SQLite:$dbfn",'','',
-		       { AutoCommit=>0,
-			 RaiseError=>1, ShowErrorStatement=>1,
-			 unicode=>1 })
-	or die "$dbfn $DBI::errstr ?";
-    # default timeout is 30s which is plenty
+    $dbh= connect_core($dbfn);
 }
 
 sub db_doall ($) {