yarrg database code: eliminate all NATURAL JOINs and turn them into JOIN USING

[ypp-sc-tools.main.git] / yarrg / web / query_age

diff --git a/yarrg/web/query_age b/yarrg/web/query_age
index efd709692a855426a1ae3f7ca819a2f009ce8b4f..a115bbdd562dd53286be49ff175f5519f366cd28 100644 (file)
--- 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();
 
@@ -123,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;