Merge branch 'master' of ijackson@chiark:things/Yarrgweb/ypp-sc-tools

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index d5c77001c60b657800e98701242c6b78be989e83..84ea71066c186902d95b7108e874323092ff8d0b 100644 (file)
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -43,15 +43,12 @@ use JSON;
 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(&dbw_connect &ocean_list $sourcebasedir
+    @EXPORT      = qw(&dbw_connect &ocean_list &sourcebasedir
                      &to_json_shim &to_json_protecttags
                      &set_ctype_utf8
                      &prettyprint_age &meta_prettyprint_age);
@@ -60,24 +57,31 @@ BEGIN {
     @EXPORT_OK   = qw();
 }
 
-our $datadir='.';
-our $sourcebasedir;
-
-for my $dir (@INC) {
-    if ($dir =~ m/\.perl-lib$/) {
-       $sourcebasedir= "$dir/..";
-       if (stat "$dir/DATA") {
-           $datadir= "$dir/DATA";
-       } elsif ($!==&ENOENT) {
-           $datadir= "$dir";
-       } else {
-           die "stat $dir/DATA $!";
+sub sourcebasedir () {
+    my $dir;
+    
+    for my $dir (@INC) {
+       if ($dir =~ m/\.perl-lib$/) {
+           $dir= "$dir/..";
+           last;
        }
-       last;
     }
+    defined $dir or
+       die "no source base dir in @INC";
+    return $dir;
+}
+
+my datadir () {
+    my $dir= sourcebasedir();
+    if (stat "$dir/DATA") {
+       return "$dir/DATA";
+    } elsif ($!==&ENOENT) {
+       return "$dir";
+    } else {
+       die "stat $dir/DATA $!";
+    }
+    return '.';
 }
-defined $sourcebasedir or
-    die "no source base dir in @INC";
 
 my @ocean_list;
 
@@ -101,7 +105,7 @@ sub dbw_connect ($) {
     my ($ocean) = @_;
     die "unknown ocean $ocean ?"
        unless grep { $_ eq $ocean } ocean_list();
-    return dbr_connect($datadir, $ocean);
+    return dbr_connect(datadir(), $ocean);
 }
 
 sub to_json_shim ($) {

diff --git a/yarrg/web/source.tar.gz b/yarrg/web/source.tar.gz
index 13cd22f4d9040724a67d18839794b649493f2911..1d92ad8584255028578f7b1cbb2da41f9376f5f5 100755 (executable)
--- a/yarrg/web/source.tar.gz
+++ b/yarrg/web/source.tar.gz
@@ -42,7 +42,7 @@ use CommodsWeb;
 $r->content_type('application/octet-stream');
 $m->flush_buffer();
 
-$ENV{'YPPSC_YARRG_SRCBASE'}= $sourcebasedir;
+$ENV{'YPPSC_YARRG_SRCBASE'}= sourcebasedir();
 my $pipe= new IO::Pipe or die $!;
 my $pid= fork();  defined $pid or die $!;
 if (!$pid) {