Merge branch 'web' of /u/ijackson/things/ypp-sc-tools

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 1eae15e11e84159e50cf834f641fa970eccb6298..3f0f5f5ba8320d38ed62cb0f2e3c9785a031e572 100644 (file)
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -69,7 +69,7 @@ sub sourcebasedir () {
     return $dir;
 }
 
-my datadir () {
+sub datadir () {
     my $dir= sourcebasedir();
     if (stat "$dir/DATA") {
        return "$dir/DATA";
@@ -84,6 +84,7 @@ my datadir () {
 my @ocean_list;
 
 sub ocean_list () {
+    my $datadir= datadir();
     if (!@ocean_list) {
        my $fn= "$datadir/master-info.txt";
        my $f= new IO::File $fn or die $!;