X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2FCommodsDatabase.pm;h=c51008003b7ef64af5914c96dc9db8d0a8674fd6;hp=79744cede7254daabbb07cd0db1941d2e0b7eae2;hb=85ff13e971f08d5093e61749d457339d481d23f5;hpb=c363ec70c47a05f429b3bda15f4a4e42d5233eb2

diff --git a/yarrg/CommodsDatabase.pm b/yarrg/CommodsDatabase.pm
index 79744ce..c510080 100644
--- a/yarrg/CommodsDatabase.pm
+++ b/yarrg/CommodsDatabase.pm
@@ -45,7 +45,7 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&db_setocean &db_writer &db_connect $dbh
 		      &db_filename &db_doall &db_onconflict
-		      &dbr_filename &dbr_connect);
+		      &dbr_filename &dbr_connect &db_connect_core);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
@@ -57,10 +57,10 @@ sub dbr_filename ($$) {
 }
 sub dbr_connect ($$) {
     my ($datadir,$ocean) = @_;
-    return connect_core(dbr_filename($datadir,$ocean));
+    return db_connect_core(dbr_filename($datadir,$ocean));
 }
 
-sub connect_core ($) {
+sub db_connect_core ($) {
     my ($fn)= @_;
     my $h= DBI->connect("dbi:SQLite:$fn",'','',
 		       { AutoCommit=>0,
@@ -110,7 +110,7 @@ sub db_writer () {
 }
 
 sub db_connect () {
-    $dbh= connect_core($dbfn);
+    $dbh= db_connect_core($dbfn);
 }
 
 sub db_doall ($) {