X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2FCommodsWeb.pm;h=387b0f2326f0d8130cb38194789ecaa784ec987e;hb=6bf99c50a24be916c7a1d36a1b9705bdd7828f60;hp=84ea71066c186902d95b7108e874323092ff8d0b;hpb=492ee8e5d023945e2768e9568f22bd63a19b59f4;p=ypp-sc-tools.db-test.git diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm index 84ea710..387b0f2 100644 --- a/yarrg/CommodsWeb.pm +++ b/yarrg/CommodsWeb.pm @@ -71,7 +71,7 @@ sub sourcebasedir () { return $dir; } -my datadir () { +sub datadir () { my $dir= sourcebasedir(); if (stat "$dir/DATA") { return "$dir/DATA"; @@ -86,6 +86,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 $!;