X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_age;h=a115bbdd562dd53286be49ff175f5519f366cd28;hp=fd2044d97b4463457d88776b71dc0000b45590ea;hb=19669922dd2393c23371ee1532824e528b897de0;hpb=3dbb2f33eae3a509123ffc99e48e35f858a8292a

diff --git a/yarrg/web/query_age b/yarrg/web/query_age
index fd2044d..a115bbd 100644
--- a/yarrg/web/query_age
+++ b/yarrg/web/query_age
@@ -47,7 +47,7 @@ $dbh
 my $now= time;
 
 my $sth= $dbh->prepare("SELECT archipelago, islandid, islandname, timestamp
-				FROM uploads NATURAL JOIN islands
+				FROM uploads JOIN islands USING (islandid)
 				ORDER BY archipelago, islandname");
 $sth->execute();
 
@@ -81,7 +81,6 @@ $sth->execute();
 % $da_ages{'id_loaded'}= 0;
 % my $rowix= 0;
 % while ($row= $fetchrow->()) {
-%	print STDERR "$row\n";
 %	my $rowid= "id_$row->{'islandid'}";
 %	my $cellid= "c$rowid";
 %	my $age= $now - $row->{'timestamp'};
@@ -124,6 +123,7 @@ Time since this page loaded:
     var now= Date.now();
     debug('updating now='+now);
     for (var ageid in <% $jsprefix %>ages) {
+      if (!<% $jsprefix %>ages.hasOwnProperty(ageid)) continue;
       var oldage= <% $jsprefix %>ages[ageid];
       var el= document.getElementById(<% $elemidprefix %>ageid);
       var age= oldage + (now - da_pageload) / 1000;