Changeset 26694 for gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/html-to-expeditee.pl.in

Timestamp:

2013-01-11T18:27:42+13:00 (11 years ago)

Author:

davidb

Message:

These scripts will now search the processed GSDL document's xml for frame number and assocfilepath values.

File:

• gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/html-to-expeditee.pl.in (modified) (8 diffs)

gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/html-to-expeditee.pl.in

@@ -182 +182 @@
           
           //url += "&p.showExpediteeAttributes=1";
+          url += "&p.showAssocFilePath=1";
 
           
@@ -213 +214 @@
             iframeDoc = iframe.contentWindow.document;
           }
-
-          var frameID = (numDocOIDs - docOIDs.length);
-          var progressPercent = frameID/numDocOIDs * 100;
-
+          
+          var xmlUrl = iframe.src + "&o=xml";
+          
+          var iter = (numDocOIDs - docOIDs.length);
+          var progressPercent = iter/numDocOIDs * 100;
+          
+          /*Check if a frame-id metadata element already exists, 
+          otherwise generate a new frame number based on the 
+          number of documents to process.*/
+          var frameNum = getMetadata(xmlUrl,'frameID');
+          
+          if(frameNum === null){
+            frameNum = iter;
+            console.log("no frameNum found, use iter: " + frameNum);
+          }else{
+            console.log("frameNum metadata found: " + frameNum);
+          }
+          
           \$(function() {
           \$('#progressbar').progressbar({ value: progressPercent })
@@ -228 +243 @@
           var pxr = gsContentPos.xr;
           */
-
-          //get assocfilepath from xml 
-          var xmlUrl = iframe.src + "&o=xml";
-          
-          var assoc = getAssocFilePath(xmlUrl);
+          
+          //Check if an assocfilepath annotation already exists on the page, otherwise obtain it from the xml.
+          var assocElem = iframeDoc.getElementById('assocfilepath');
+          var assoc = null;
+          
+          if(assocElem === undefined || assocElem === null){
+            assoc = getMetadata(xmlUrl,'assocfilepath');
+          }
 
           var expFrameTree = htmlToExpeditee(gsContent);
@@ -248 +266 @@
           }
           
-          params += "&a=generate-frame&fn=" + frameID;
+          //params += "&a=generate-frame&fn=" + iter;
+          params += "&a=generate-frame&fn=" + frameNum;
           params += "&json=" + escape(expFrame);
           
-          //add an assocfilepath parameter
-          
-          if(assoc !== null && assoc !== undefined){
+          //add an assocfilepath parameter but only if it is defined.
+          if(assoc !== null){
             params += "&assoc=" + assoc;
           }
@@ -288 +306 @@
 
           //url += "&p.showExpediteeAttributes=1";
-
-          iframe.src = url;
+            url += "&p.showAssocFilePath=1";
+          
+            iframe.src = url;
           }
           else {
-          var progressbar = document.getElementById("progressbar");
-          progressbar.style.display = "none";
-
-          iframe.style.display = "none";
-          delete iframe.src;
+            var progressbar = document.getElementById("progressbar");
+            progressbar.style.display = "none";
+
+            iframe.style.display = "none";
+            delete iframe.src;
           }
       }
@@ -302 +321 @@
       }
       
-      function getAssocFilePath(xmlUrl){
-      var assoc = "";
+    /**
+    * Once this is working, remove getAssocFilePath method
+    * This method is used at this stage to retrieve assocfilepath
+    * and frame number metadata values from the document's xml.
+    **/
+    function getMetadata(xmlUrl,nameValue){
       
-      \$.ajax({
+        var metadata = null;
+        
+         \$.ajax({
             type: "GET",
             async: false,
@@ -317 +342 @@
                     var name = \$(this).attr('name');
                     
-                    if(name === 'assocfilepath'){
-                        if(assoc === ""){
-                            assoc = \$(this).text();
-                            //console.log(assoc);
+                    if(name === nameValue){
+                        if(metadata === null){
+                            metadata = \$(this).text();
+                            //console.log(metadata);
                         }
                         
@@ -329 +354 @@
             
           });
-          
-          return assoc;
+        
+        return metadata;
       }