Fix broken sourcedir things

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 3f0f5f5ba8320d38ed62cb0f2e3c9785a031e572..036c7e99ffe4dd48a55324578f58aaa00754e4d1 100644 (file)
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -57,20 +57,23 @@ BEGIN {
     @EXPORT_OK   = qw();
 }
 
     @EXPORT_OK   = qw();
 }
 

-sub sourcebasedir () {
+sub dotperllibdir () {

     my $dir;
     
     for my $dir (@INC) {
        if ($dir =~ m/\.perl-lib$/) {
     my $dir;
     
     for my $dir (@INC) {
        if ($dir =~ m/\.perl-lib$/) {

-           return "$dir/..";
+           return $dir;

        }
     }
        }
     }

-    die "no source base dir in @INC";
-    return $dir;
+    die "no appropriate dotperllib dir in @INC";
+}
+
+sub sourcebasedir () {
+    return dotperllibdir().'/..';

 }
 
 sub datadir () {
 }
 
 sub datadir () {

-    my $dir= sourcebasedir();
+    my $dir= dotperllibdir();

     if (stat "$dir/DATA") {
        return "$dir/DATA";
     } elsif ($!==&ENOENT) {
     if (stat "$dir/DATA") {
        return "$dir/DATA";
     } elsif ($!==&ENOENT) {


@@ -87,7 +90,7 @@ sub ocean_list () {
     my $datadir= datadir();
     if (!@ocean_list) {
        my $fn= "$datadir/master-info.txt";
     my $datadir= datadir();
     if (!@ocean_list) {
        my $fn= "$datadir/master-info.txt";

-       my $f= new IO::File $fn or die $!;
+       my $f= new IO::File $fn or die "$fn $!";

        my @r;
        while (<$f>) {
            next unless m/^ocean\s+(\S.*\S)\s*$/;
        my @r;
        while (<$f>) {
            next unless m/^ocean\s+(\S.*\S)\s*$/;