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

Timestamp:

2013-01-19T15:25:50+13:00 (11 years ago)

Author:

davidb

Message:

Fixed bug with assocfilepath annotation not being written to the frames.

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

@@ -231 +231 @@
                     function writeDocument(iframe){
                         
-                        console.log("now processing document: " + iframe.src + " ***");
                         var xmlUrl = iframe.src + "&o=xml";
-                        
+                        console.log("xml url: " + xmlUrl);
                         var iter = (numDocOIDs - docOIDs.length);
                         var progressPercent = iter/numDocOIDs * 100;
@@ -239 +238 @@
                         var frameNum = getMetadata(xmlUrl,'frameID');
                         
-                        if(frameNum == null){
+                        if(frameNum === null){
                             frameNum = iter;
                         }
                         
                         var iframeDoc = getIframeDoc(iframe);
-                        
-                        
+
                         \$(function(){
                             \$('#progressbar').progressbar({ value: progressPercent });
@@ -254 +252 @@
                         var assocElem = iframeDoc.getElementById("assocfilepath");
                         
-                        var assocElem = iframeDoc.getElementById('assocfilepath');
                         var assoc = null;
                         
                         if(assocElem === undefined || assocElem === null){
                             assoc = getMetadata(xmlUrl,'assocfilepath');
+                            
                         }
                         
@@ -297 +295 @@
                             //Add docOID and matching frame number to an associative array for later use.
                             hashMapDocFrames[docOID] = frameNum;
-                            
-                            
+                                                        
                             iframe.src = getDocumentUrl(docOID);
                             
@@ -338 +335 @@
                         url += "?c=" + collect + "&a=d&d=" + docOID;
                                         
-                        url += "&p.showAssocFilePath = 1";
+                        url += "&p.showAssocFilePath=1";
                         
                         return url;
@@ -348 +345 @@
                         var progressPercent = frameNum / numClPages * 100;
                         var iframeDoc = getIframeDoc(iframe);
-                        console.log("Processing cl page: " + iframe.src + " ****");
+                        //console.log("Processing cl page: " + iframe.src + " ****");
                         
                         \$(function(){
@@ -378 +375 @@
                                     
                                     var fn = hashMapDocFrames[docOID];
+                                    
                                     var aElemChildren = aElem.getElementsByTagName('*');
                                     
                                     for(var j = 0; j < aElemChildren.length; j++){
                                         var aElemChild = aElemChildren[j];
-                                        var frameName = collect + fn;
                                         
-                                        aElemChild.setAttribute("link",frameName);
+                                        if(fn !== null && fn!== undefined){
+                                            var frameName = collect + fn;
+                                        
+                                            //aElemChild.setAttribute("link",frameName);
+                                            //console.log(aElemChild.getAttribute('link'));
+                                            //console.log(aElemChild.link);
+                                        }
                                     }
                                     
@@ -400 +403 @@
                         var expFrameTree = htmlToExpeditee(gsContent);
                         var expFrame = JSON.stringify(expFrameTree);
-                        //console.log(expFrame);
+                        console.log(expFrame);
                         
                         var url = "cgi-bin/html-to-expeditee.pl";