X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_age;h=fd2044d97b4463457d88776b71dc0000b45590ea;hp=28d6a5f667074203c49451d522ad55b7d9fb1254;hb=efd685a5df610ffefc545a41be67e2e0d4b69c7c;hpb=fd6bf359d9051fe0c6d269a44bcc08cc53aa2fea

diff --git a/yarrg/web/query_age b/yarrg/web/query_age
index 28d6a5f..fd2044d 100644
--- a/yarrg/web/query_age
+++ b/yarrg/web/query_age
@@ -40,113 +40,109 @@ $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>
 
 <%perl>
 my $now= time;
 
-my $row;
 my $sth= $dbh->prepare("SELECT archipelago, islandid, islandname, timestamp
 				FROM uploads NATURAL JOIN islands
-				ORDER BY archipelago, islandid");
+				ORDER BY archipelago, islandname");
 $sth->execute();
 
 </%perl>
+<div class="results">
 
+<& SELF:pageload &>
+<%method pageload>
 <&| script &>
   da_pageload= Date.now();
 </&script>
+</%method>
 
 <h1>Market data age</h1>
 
-<table id="ts_table">
+<& SELF:agestable, now => $now, fetchrow => sub { $sth->fetchrow_hashref } &>
+
+<%method agestable>
+<%args>
+  $now
+  $fetchrow
+</%args>
+<table class="data" id="ts_table" rules="groups">
 <tr>
 <th>Archipelago
 <th>Island
 <th>Age
-</tr>
+% my $row;
 % my %da_ages;
 % my %ts_sortkeys;
 % $da_ages{'id_loaded'}= 0;
-% while ($row=$sth->fetchrow_hashref) {
+% my $rowix= 0;
+% while ($row= $fetchrow->()) {
+%	print STDERR "$row\n";
 %	my $rowid= "id_$row->{'islandid'}";
 %	my $cellid= "c$rowid";
 %	my $age= $now - $row->{'timestamp'};
 %	$ts_sortkeys{'0'}{$rowid}= $row->{'archipelago'};
 %	$ts_sortkeys{'1'}{$rowid}= $row->{'islandname'};
 %	$da_ages{$rowid}= $age;
-<tr id=<% $rowid %>
+<tr id=<% $rowid %> class="<% 'datarow'.($rowix & 1) %>"
    > <td><% $row->{'archipelago'} |h
   %> <td><% $row->{'islandname'} |h
-  %> <td id="<% $cellid %>"><% $prettyprint_age->($age) %> </tr>
+  %> <td id="<% $cellid %>" align=right><% prettyprint_age($age) %> </tr>
+%	$rowix++;
 % }
 </table>
+<& SELF:dataages, id2age => \%da_ages,
+	jsprefix => 'dat_', elemidprefix => "'c'+" &>
 
-<& tabsort, table => 'ts_table', cols => [
+<&| tabsort, table => 'ts_table', rowclass => 'datarow', cols => [
 	{}, {},
 	{ DoReverse => 1,
 	  Numeric => 1,
-	  SortKey => "da_ages[rowid]" }]
+	  SortKey => "dat_ages[rowid]" }]
   &>
-
+  ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
+</&tabsort>
 <p>
+% print $m->content();
 Time since this page loaded:
 <span id="cid_loaded">(not known; times above not updating)</span>
 
-<form action="lookup" method="get">
-<input type=submit name=submit value="Reload">
-<& "lookup:formhidden", ours => sub { 0; } &>
-</form>
+</%method>
 
+<%method dataages>
+<%args>
+  $id2age
+  $elemidprefix => ''
+  $jsprefix => 'da_'
+</%args>
 <&| script &>
-  ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
-  da_ages= <% to_json_protecttags(\%da_ages) %>;
-
-  function da_Refresh() {
+  function <% $jsprefix %>Refresh() {
     var now= Date.now();
     debug('updating now='+now);
-    for (var rowid in da_ages) {
-      var oldage= da_ages[rowid];
-      var cellid= 'c'+rowid;
-      var el= document.getElementById(cellid);
+    for (var ageid in <% $jsprefix %>ages) {
+      var oldage= <% $jsprefix %>ages[ageid];
+      var el= document.getElementById(<% $elemidprefix %>ageid);
       var age= oldage + (now - da_pageload) / 1000;
-      var newhtml= <% $meta_prettyprint_age->('age','Math.floor','+') %>;
-% if ($ARGS{debug}) {
-      if (cellid == 'cid_loaded')
-	debug('element rowid='+rowid+' cellid='+cellid
-		+' oldage='+oldage+' age='+age+': '+newhtml);
-% }
+      var newhtml= <% meta_prettyprint_age('age','Math.floor','+') %>;
       el.innerHTML= newhtml;
     }
   }
+  <% $jsprefix %>ages= <% to_json_protecttags($id2age) %>;
+  window.setInterval(<% $jsprefix %>Refresh, 10000);
+  register_onload(<% $jsprefix %>Refresh);
+</&>
+</%method>
 
-  function all_onload() {
-    ts_onload__ts_table();
-    da_Refresh();
-  }
-  window.onload= all_onload;
-  window.setInterval(da_Refresh, 10000);
-</&script>
+<form action="lookup" method="get">
+<input type=submit name=submit value="Reload">
+<& "lookup:formhidden", ours => sub { 0; } &>
+</form>
 
+</div>
 <%init>
 use POSIX;
 use CommodsWeb;