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

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