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

diff --combined yarrg/CommodsWeb.pm
index 387b0f2326f0d8130cb38194789ecaa784ec987e,1eae15e11e84159e50cf834f641fa970eccb6298..3f0f5f5ba8320d38ed62cb0f2e3c9785a031e572
--- 1/yarrg/CommodsWeb.pm
--- 2/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@@ -62,16 -62,14 +62,14 @@@ sub sourcebasedir () 
      
      for my $dir (@INC) {
        if ($dir =~ m/\.perl-lib$/) {
-           $dir= "$dir/..";
-           last;
+           return "$dir/..";
        }
      }
-     defined $dir or
-       die "no source base dir in @INC";
+     die "no source base dir in @INC";
      return $dir;
  }
  
 -my datadir () {
 +sub datadir () {
      my $dir= sourcebasedir();
      if (stat "$dir/DATA") {
        return "$dir/DATA";
@@@ -86,7 -84,6 +84,7 @@@
  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 $!;