From d1140fe21c4a6cdb1ba9c02e26b80d71ffe31965 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Mon, 24 Aug 2009 03:18:24 +0100
Subject: [PATCH] prettyprint_age moved to commodsweb

---
 yarrg/CommodsWeb.pm | 24 +++++++++++++++++++++++-
 yarrg/web/query_age | 22 ++--------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index d423a29..f0c183c 100644
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -53,7 +53,8 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&dbw_connect &ocean_list $sourcebasedir
 		      &to_json_shim &to_json_protecttags
-		      &set_ctype_utf8);
+		      &set_ctype_utf8
+		      &prettyprint_age &meta_prettyprint_age);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
@@ -121,4 +122,25 @@ sub to_json_protecttags ($) {
     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;
diff --git a/yarrg/web/query_age b/yarrg/web/query_age
index 28d6a5f..a90ca34 100644
--- a/yarrg/web/query_age
+++ b/yarrg/web/query_age
@@ -40,24 +40,6 @@ $dbh
 </%args>
 
 <%once>
-my $meta_prettyprint_age= sub {
-    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
-};
-
-my $prettyprint_age;
-eval '
-  $prettyprint_age= sub {
-		my ($age) = @_;
-		'.$meta_prettyprint_age->('$age','floor','.').'
-  };
-' or die "$@";
 
 </%once>
 
@@ -97,7 +79,7 @@ $sth->execute();
 <tr id=<% $rowid %>
    > <td><% $row->{'archipelago'} |h
   %> <td><% $row->{'islandname'} |h
-  %> <td id="<% $cellid %>"><% $prettyprint_age->($age) %> </tr>
+  %> <td id="<% $cellid %>"><% prettyprint_age($age) %> </tr>
 % }
 </table>
 
@@ -129,7 +111,7 @@ Time since this page loaded:
       var cellid= 'c'+rowid;
       var el= document.getElementById(cellid);
       var age= oldage + (now - da_pageload) / 1000;
-      var newhtml= <% $meta_prettyprint_age->('age','Math.floor','+') %>;
+      var newhtml= <% meta_prettyprint_age('age','Math.floor','+') %>;
 % if ($ARGS{debug}) {
       if (cellid == 'cid_loaded')
 	debug('element rowid='+rowid+' cellid='+cellid
-- 
2.30.2