abolish $dbh global in Mason code to shorten db connection lifetime

[ypp-sc-tools.web-live.git] / yarrg / CommodsWeb.pm

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 2bd558b4dc74daec15da023a21b8d8db046f7524..5e1520e22f45a3e0d3853f53e6523f1b370e6e5c 100644 (file)
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -35,22 +35,52 @@ use POSIX;
 use Commods;
 use CommodsDatabase;
 
+our $self_url;
+our $base_url;
+
 BEGIN {
     use Exporter ();
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw($dbh &db_setocean &db_connect &db_doall);
+    @EXPORT      = qw(&dbw_connect &ocean_list);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
 }
 
+our $datadir='.';
+
 for my $dir (@INC) {
     if ($dir =~ m/\.perl-lib$/) {
-       db_setdatadir("$dir/DATA");
+       $datadir= "$dir/DATA";
        last;
     }
 }
 
+my @ocean_list;
+
+sub ocean_list () {
+    if (!@ocean_list) {
+       my $fn= "$datadir/master-info.txt";
+       my $f= new IO::File $fn or die $!;
+       my @r;
+       while (<$f>) {
+           next unless m/^ocean\s+(\S.*\S)\s*$/;
+           push @r, $1;
+       }
+       $f->error and die $!;
+       close $fn;
+       @ocean_list= @r;
+    }
+    return @ocean_list;
+}
+
+sub dbw_connect ($) {
+    my ($ocean) = @_;
+    die "unknown ocean $ocean ?"
+       unless grep { $_ eq $ocean } ocean_list();
+    return dbr_connect($datadir, $ocean);
+}
+
 1;