X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2FCommodsDatabase.pm;h=2ea674d6963e489647b779fb880b464931fc1684;hb=a9583fa8a29e889f435ee4d6cf3dc6a5979a6bd5;hp=6f2f6274e09d5b72ddc535d26565eda0757e9acf;hpb=3793840cd03da4b9bf470ec36bcf1acacb536a49;p=ypp-sc-tools.db-test.git

diff --git a/yarrg/CommodsDatabase.pm b/yarrg/CommodsDatabase.pm
index 6f2f627..2ea674d 100644
--- a/yarrg/CommodsDatabase.pm
+++ b/yarrg/CommodsDatabase.pm
@@ -44,7 +44,7 @@ BEGIN {
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&db_setocean &db_writer &db_connect $dbh
-		      &db_filename &db_doall &db_onconflict);
+		      &db_filename &db_doall &db_onconflict &db_setdatadir);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
@@ -52,10 +52,14 @@ BEGIN {
 
 our $dbfn;
 our $dbh;
+our $datadir= '.';
 
+sub db_setdatadir ($) {
+    $datadir= $_[0];
+}
 sub db_setocean ($) {
     my ($oceanname) = @_;
-    $dbfn= "OCEAN-$oceanname.db";
+    $dbfn= "$datadir/OCEAN-$oceanname.db";
 }
 sub db_filename () {
     return $dbfn;
@@ -89,6 +93,7 @@ sub db_writer () {
 }
 
 sub db_connect () {
+    return if $dbh;
     $dbh= DBI->connect("dbi:SQLite:$dbfn",'','',
 		       { AutoCommit=>0,
 			 RaiseError=>1, ShowErrorStatement=>1,