Changeset 26751 for gs3-extensions/html-to-expeditee

Timestamp:

2013-01-18T20:25:55+13:00 (11 years ago)

Author:

davidb

Message:

Fixed bug with first CL page not being written out to a frame.

File:

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

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

@@ -161 +161 @@
                                         if(href.match(clRE)){
                                             if(!visitedURLs[href]){
-                                                console.log("found a new CL line: " + href);
+                                                //console.log("found a new CL line: " + href);
                                                 outstandingURLs.push(href);
                                                 visitedURLs[href] = 1;
@@ -171 +171 @@
                                                 var docOID = docMatch[1];
                                                 
-                                                console.log("found a new doc line: " + docOID);
+                                                //console.log("found a new doc line: " + docOID);
                                                 visitedURLs[href] = 1;
                                                 docOIDs.push(docOID);
@@ -201 +201 @@
                     }
                     
+                    
+                    
                                         
                     function pageLoaded(){
@@ -212 +214 @@
                             }
                             
-                            var iframeDoc;
+                            var iframeDoc = getIframeDoc(iframe);
+                                                
+                        
+                            /*Check url - if it's a doc Url, call "writeDocument", otherwise call "writeClPage"*/
+                            var clRE = new RegExp("(\\\\/)browse\\\\/" + cl + "(\\\\/\\\\d+)+(\$)");
+                            
+                            
+                            if(iframe.src.match(clRE)){
+                                writeClPage(iframe,iframeDoc);
+                            }else{
+                                writeDocument(iframe,iframeDoc);
+                            }
+                        }
+                    }
+                    
+                    function writeDocument(iframe){
+                        
+                        console.log("now processing document: " + iframe.src + " ***");
+                        var xmlUrl = iframe.src + "&o=xml";
+                        
+                        var iter = (numDocOIDs - docOIDs.length);
+                        var progressPercent = iter/numDocOIDs * 100;
+                        
+                        var frameNum = getMetadata(xmlUrl,'frameID');
+                        
+                        if(frameNum == null){
+                            frameNum = iter;
+                        }
+                        
+                        var iframeDoc = getIframeDoc(iframe);
+                        
+                        
+                        \$(function(){
+                            \$('#progressbar').progressbar({ value: progressPercent });
+                        });
+                        
+                        var gsContent = iframeDoc.getElementById("gs_content");
+                        
+                        var assocElem = iframeDoc.getElementById("assocfilepath");
+                        
+                        var assocElem = iframeDoc.getElementById('assocfilepath');
+                        var assoc = null;
+                        
+                        if(assocElem === undefined || assocElem === null){
+                            assoc = getMetadata(xmlUrl,'assocfilepath');
+                        }
+                        
+                        var expFrameTree = htmlToExpeditee(gsContent,compute_font,compute_width);
+                        
+                        var expFrame = JSON.stringify(expFrameTree);
+                        //console.log(expFrame);
+                        
+                        var url = "cgi-bin/html-to-expeditee.pl";
+                        var params = "c=" + collect;
+                        
+                        if(site.match(/\\w/)){
+                            params += "&site=" + site;
+                        }
+                        
+                        params += "&a=generate-frame&fn=" + frameNum;
+                        params += "&json=" + escape(expFrame);
+                        
+                        //Add an assocfilepath but only if it is defined
+                        if(assoc !== null){
+                            params += "&assoc=" + assoc;
+                        }
+                        
+                        params += "&compute-font=" + compute_font;
+                                                
+                        params += "&page-type=" + "document";
+                                            
+                        
+                        var clHtml = urlPostSync(url,params);
+                        
+                        if(!clHtml.match(/html-to-expeditee saved frame/)){
+                            alert("ERROR PROCESSING URL: " + url);
+                        }
+                        
+                        if(docOIDs.length > 0){
+                            var docOID = docOIDs.shift();
+                            
+                            //Add docOID and matching frame number to an associative array for later use.
+                            hashMapDocFrames[docOID] = frameNum;
+                            
+                            
+                            iframe.src = getDocumentUrl(docOID);
+                            
+                        }else{
+                            
+                            //start writing CL pages.
+                            if(generate_browsing){
+                                iframe.src = clPages.shift();
+                            }else{
+                                //We are finished
+                                finish(iframe);
+                            }
+                        }   
+                    }
+                    
+                    function getIframeDoc(){
+                        
+                        var iframeDoc = null;
                             
                             if(iframe.contentDocument){ /* FF and Chrome */
@@ -220 +323 @@
                             }
                         
-                            /*Check url - if it's a doc Url, call "writeDocument", otherwise call "writeClPage"*/
-                            var clRE = new RegExp("(\\\\/)browse\\\\/" + cl + "(\\\\/\\\\d+)+(\$)");
-                            
-                            
-                            if(iframe.src.match(clRE)){
-                                writeClPage(iframe,iframeDoc);
-                            }else{
-                                writeDocument(iframe,iframeDoc);
-                            }
-                        }
-                    }
-                    
-                    function writeDocument(iframe,iframeDoc){
-                        
-                        var xmlUrl = iframe.src + "&o=xml";
-                        
-                        var iter = (numDocOIDs - docOIDs.length);
-                        var progressPercent = iter/numDocOIDs * 100;
-                        
-                        var frameNum = getMetadata(xmlUrl,'frameID');
-                        
-                        if(frameNum == null){
-                            frameNum = iter;
-                        }
-                        
-                        //Add docOID and matching frame number to an associative array for later use.
-                        hashMapDocFrames[docOID] = frameNum;
-                        
-                        \$(function(){
-                            \$('#progressbar').progressbar({ value: progressPercent });
-                        });
-                        
-                        var gsContent = iframeDoc.getElementById("gs_content");
-                        
-                        var assocElem = iframeDoc.getElementById("assocfilepath");
-                        
-                        var assocElem = iframeDoc.getElementById('assocfilepath');
-                        var assoc = null;
-                        
-                        if(assocElem === undefined || assocElem === null){
-                            assoc = getMetadata(xmlUrl,'assocfilepath');
-                        }
-                        
-                        var expFrameTree = htmlToExpeditee(gsContent,compute_font,compute_width);
-                        
-                        var expFrame = JSON.stringify(expFrameTree);
-                        //console.log(expFrame);
-                        
-                        var url = "cgi-bin/html-to-expeditee.pl";
-                        var params = "c=" + collect;
-                        
-                        if(site.match(/\\w/)){
-                            params += "&site=" + site;
-                        }
-                        
-                        params += "&a=generate-frame&fn=" + frameNum;
-                        params += "&json=" + escape(expFrame);
-                        
-                        //Add an assocfilepath but only if it is defined
-                        if(assoc !== null){
-                            params += "&assoc=" + assoc;
-                        }
-                        
-                        params += "&compute-font=" + compute_font;
-                                                
-                        params += "&page-type=" + "document";
-                                            
-                        
-                        var clHtml = urlPostSync(url,params);
-                        
-                        if(!clHtml.match(/html-to-expeditee saved frame/)){
-                            alert("ERROR PROCESSING URL: " + url);
-                        }
-                        
-                        if(docOIDs.length > 0){
-                            var docOID = docOIDs.shift();
-                            iframe.src = getDocumentUrl(docOID);
-                            
-                        }else{
-                            //start writing CL pages.
-                            if(generate_browsing){
-                                numClPages = clPages.length;
-                            
-                                var url = clPages.shift();
-                                iframe.src = url;
-                                writeClPage(iframe,iframeDoc);
-                            }else{
-                                //We are finished
-                                finish(iframe);
-                            }
-                        }   
+                        
+                        return iframeDoc;
                     }
                     
@@ -329 +343 @@
                     }
                     
-                    function writeClPage(iframe,iframeDoc){
+                    function writeClPage(iframe){
                         
                         var frameNum = numClPages - clPages.length;
                         var progressPercent = frameNum / numClPages * 100;
+                        var iframeDoc = getIframeDoc(iframe);
+                        console.log("Processing cl page: " + iframe.src + " ****");
                         
                         \$(function(){
@@ -343 +359 @@
                         var docRE    = new RegExp("(?:\\\\/)document\\\\/(.*?)(?:\$)");
                         
-                        //get rid of rectangles around nodes.
+                        
                         for(var i = 0; i < gsContentChildren.length; i++){
                             var child = gsContentChildren[i];
                             
+                            //get rid of rectangles around nodes.
                             if(child.tagName !== "IMG"){
                                 child.setAttribute('rect','norect');
@@ -367 +384 @@
                                         var frameName = collect + fn;
                                         
-                                        //aElemChild.setAttribute("link",frameName);
+                                        aElemChild.setAttribute("link",frameName);
                                     }
                                     
@@ -376 +393 @@
                             }
                         }
-                        
-                        //add link attribute to children nodes of <a> elements.
-                        
+    
                         
                         //TODO: Need to change htmlToExpeditee code to account for links
@@ -406 +421 @@
                         
                         if(clPages.length > 0){
-                            var clPage = clPages.shift();
-                            iframe.src = clPage;
+                            iframe.src = clPages.shift();
                         }else{
                             finish(iframe);