X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2FCommodsWeb.pm;h=5e1520e22f45a3e0d3853f53e6523f1b370e6e5c;hb=c363ec70c47a05f429b3bda15f4a4e42d5233eb2;hp=2bd558b4dc74daec15da023a21b8d8db046f7524;hpb=2f82405c3eaa7bced0db77fa4cd243befb268406;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 2bd558b..5e1520e 100644
--- 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;