chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
routesearch: nice routesearch
[ypp-sc-tools.db-live.git]
/
yarrg
/
CommodsWeb.pm
diff --git
a/yarrg/CommodsWeb.pm
b/yarrg/CommodsWeb.pm
index 00c6f24b8cc5ce0ce9713592de4897428ffcdcd6..0f3f43df8fd236975a57ef5310cccdbf4f14b25f 100644
(file)
--- a/
yarrg/CommodsWeb.pm
+++ b/
yarrg/CommodsWeb.pm
@@
-50,7
+50,7
@@
BEGIN {
@ISA = qw(Exporter);
@EXPORT = qw(&dbw_connect &dbw_filename &ocean_list &sourcebasedir
&to_json_shim &to_json_protecttags
@ISA = qw(Exporter);
@EXPORT = qw(&dbw_connect &dbw_filename &ocean_list &sourcebasedir
&to_json_shim &to_json_protecttags
- &set_ctype_utf8
+ &set_ctype_utf8
&webdatadir
&expected_error &dbw_lookup_string
&prettyprint_age &meta_prettyprint_age);
%EXPORT_TAGS = ( );
&expected_error &dbw_lookup_string
&prettyprint_age &meta_prettyprint_age);
%EXPORT_TAGS = ( );
@@
-73,20
+73,25
@@
sub sourcebasedir () {
return dotperllibdir().'/..';
}
return dotperllibdir().'/..';
}
-sub datadir () {
- my $edir= $ENV{'YARRG_DATA_DIR'};
+sub some_datadir ($) {
+ my ($what) = @_;
+ my $edir= $ENV{"YARRG_${what}_DIR"};
return $edir if defined $edir;
my $dir= dotperllibdir();
return $edir if defined $edir;
my $dir= dotperllibdir();
- if (stat "$dir/DATA") {
- return "$dir/DATA";
+ my $dirwhat= "$dir/$what";
+ if (stat $dirwhat) {
+ return $dirwhat;
} elsif ($!==&ENOENT) {
return "$dir";
} else {
} elsif ($!==&ENOENT) {
return "$dir";
} else {
- die "stat $dir
/DATA
$!";
+ die "stat $dir
what
$!";
}
return '.';
}
}
return '.';
}
+sub webdatadir () { return some_datadir('WEBDATA'); }
+sub datadir () { return some_datadir('DATA'); }
+
my @ocean_list;
sub ocean_list () {
my @ocean_list;
sub ocean_list () {