Changeset 26205 for main

Timestamp:

2012-09-18T16:43:05+12:00 (12 years ago)

Author:

sjm84

Message:

The AJAX that tries to get the page/toc dynamically will now try again when it fails

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/document_scripts.js (modified) (5 diffs)
• transform/pages/document.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js

@@ -345 +345 @@
 {
     var ajax = gs.functions.ajaxRequest();
-    
+
     var url = gs.xsltParams.library_name + "?a=d&c=" + gs.cgiParams.c + "&excerptid=gs-document";
     if(gs.cgiParams.d && gs.cgiParams.d.length > 0)
@@ -364 +364 @@
         ajax.open("GET", url, true);
     }
+
     ajax.onreadystatechange = function()
     {
@@ -387 +388 @@
         else if(ajax.readyState == 4)
         {
-            var targetElem = document.getElementById("gs-document");
-            targetElem.innerHTML = targetElem.innerHTML + "<br/> <br/> FAILED TO LOAD PAGE";
+            setTimeout(function(){loadTopLevelPage(callbackFunction, customURL);}, 1000);
         }
     };
@@ -434 +434 @@
         else if(ajax.readyState == 4)
         {
-            var loading = document.getElementById("tocLoadingImage");
-            loading.parentNode.removeChild(loading);
-            console.log("Error Loading TOC");
+            setTimeout(retrieveFullTableOfContents, 1000);
         }
     }
@@ -605 +603 @@
         else if(ajax.readyState == 4)
         {
-            var loading = document.getElementById("tocLoadingImage");
-            loading.parentNode.removeChild(loading);
-            console.log("Error Loading TOC");
+            setTimeout(function(){retrieveTableOfContentsAndTitles();}, 1000);
         }
     }

main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

@@ -314 +314 @@
         <xsl:choose>
             <!-- NOTE: alb = ajax load bypass -->
+            <!-- 
+                If the docType is hierarchy and the we want to bypass the ajax load then do this 
+                OR If the docType is hierarchy and we have asked for the expanded document OR we have asked for the top level document then do this 
+            -->
             <xsl:when test="/page/pageResponse/document/@docType = 'hierarchy' and (/page/pageRequest/paramList/param[@name = 'alb']/@value = '1' or (string-length(/page/pageRequest/paramList/param[@name = 'd']/@value) > 0 and (/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or not(util:contains(/page/pageResponse/document/@selectedNode, '.')))))">
                 <div id="gs-document">