chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For printable trading plan: example fetch rune
[ypp-sc-tools.db-test.git]
/
yarrg
/
CommodsWeb.pm
diff --git
a/yarrg/CommodsWeb.pm
b/yarrg/CommodsWeb.pm
index adcff3492c154682263fe00698cf6fc6d8c7863a..0f3f43df8fd236975a57ef5310cccdbf4f14b25f 100644
(file)
--- a/
yarrg/CommodsWeb.pm
+++ b/
yarrg/CommodsWeb.pm
@@
-48,9
+48,9
@@
BEGIN {
our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
$VERSION = 1.00;
@ISA = qw(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 &
dbw_filename &
ocean_list &sourcebasedir
&to_json_shim &to_json_protecttags
&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 () {
@@
-106,11
+111,17
@@
sub ocean_list () {
return @ocean_list;
}
return @ocean_list;
}
-sub dbw_
connect
($) {
+sub dbw_
filename
($) {
my ($ocean) = @_;
die "unknown ocean $ocean ?"
unless grep { $_ eq $ocean } ocean_list();
my ($ocean) = @_;
die "unknown ocean $ocean ?"
unless grep { $_ eq $ocean } ocean_list();
- return dbr_connect(datadir(), $ocean);
+ return dbr_filename(datadir(), $ocean);
+}
+
+sub dbw_connect ($) {
+ my ($ocean) = @_;
+ my $fn= dbw_filename($ocean);
+ return db_connect_core($fn);
}
sub to_json_shim ($) {
}
sub to_json_shim ($) {