X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2FCommodsWeb.pm;h=198185d32df4f1855fd4ca691d809b482f91bf04;hp=0c86e6cbfe0976b20fa6e39f50c057d354486563;hb=59bee7afb77216585b904bd20f17e71005e9778c;hpb=31e88e03ff6e24e5c744b7f3f02346221ae5bab0

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 0c86e6c..198185d 100644
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -38,49 +38,61 @@ use warnings;
 
 use DBI;
 use POSIX;
+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);
     %EXPORT_TAGS = ( );
 
     @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 dotperllibdir () {
+    my $dir;
+    
+    for my $dir (@INC) {
+	if ($dir =~ m/\.perl-lib$/) {
+	    return $dir;
 	}
-	last;
     }
+    die "no appropriate dotperllib dir in @INC";
+}
+
+sub sourcebasedir () {
+    return dotperllibdir().'/..';
+}
+
+sub datadir () {
+    my $edir= $ENV{'YARRG_DATA_DIR'};
+    return $edir if defined $edir;
+    my $dir= dotperllibdir();
+    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;
 
 sub ocean_list () {
+    my $datadir= datadir();
     if (!@ocean_list) {
-	my $fn= "$datadir/master-info.txt";
-	my $f= new IO::File $fn or die $!;
+	my $fn= "$datadir/source-info.txt";
+	my $f= new IO::File $fn or die "$fn $!";
 	my @r;
 	while (<$f>) {
 	    next unless m/^ocean\s+(\S.*\S)\s*$/;
@@ -97,7 +109,46 @@ 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 ($) {
+    my ($obj) = @_;
+    # In JSON.pm 2.x, jsonToObj prints a warning to stderr which
+    # our callers don't like at all.
+    if ($JSON::VERSION >= 2.0) {
+	return to_json($obj);
+    } else {
+	return objToJson($obj);
+    }
+}
+
+sub to_json_protecttags ($) {
+    my ($v) = @_;
+    my $j= to_json_shim($v);
+    $j =~ s,/,\\/,g;
+    return $j;
+}
+
+sub meta_prettyprint_age ($$$) {
+    my ($age,$floor,$plus) = @_;
+    return <<END;
+        $age < 60 ?             'less than a minute'                    :
+        $age < 60*2 ?           '1 minute'                              :
+        $age < 3600*2 ?         $floor ($age/60) $plus' minutes'        :
+        $age < 86400*2 ?        $floor ($age/3600) $plus ' hours'       :
+                                $floor ($age/86400) $plus ' days';
+END
+};
+
+BEGIN { eval '
+  sub prettyprint_age ($) {
+		my ($age) = @_;
+		'.meta_prettyprint_age('$age','floor','.').'
+  };
+  1;
+' or die "$@";
+}
+
+
 1;