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

Timestamp:

2013-01-08T14:13:09+13:00 (11 years ago)

Author:

davidb

Message:

The html to expeditee feature will now obtain a matching assocfilepath for each frame and write this value out to the frame as a piece of text.

File:

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

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

@@ -1 @@
- #!@FULL_PERL_EXE@ -w
+ #!/cygdrive/c/strawberry/perl/bin/perl -w
 
 # Need to specify the full path of Perl above, e.g. for Windows something like
@@ -181 +181 @@
           }
           
-          url += "&p.showExpediteeAttributes=1";
-
+          //url += "&p.showExpediteeAttributes=1";
+
+          
           /* load iframe with document drawn from Greenstone collection */
           iframe.src = url;
@@ -228 +229 @@
           */
 
+          //get assocfilepath from xml 
+          var xmlUrl = iframe.src + "&o=xml";
+          
+          var assoc = getAssocFilePath(xmlUrl);
+
           var expFrameTree = htmlToExpeditee(gsContent);
 
@@ -239 +245 @@
           var params = "c=" + collect;
           if (site.match(/\\w/)) {
-        params += "&site=" + site;
+            params += "&site=" + site;
           }
+          
           params += "&a=generate-frame&fn=" + frameID;
           params += "&json=" + escape(expFrame);
+          
+          //add an assocfilepath parameter
+          
+          if(assoc !== null && assoc !== undefined){
+            params += "&assoc=" + assoc;
+          }
 
           var clHtml = urlPostSync(url,params);
 
           if (!clHtml.match(/html-to-expeditee saved frame/)) {
-          alert("Error processing url: " + url);
+            alert("Error processing url: " + url);
           }
 
@@ -274 +287 @@
               }
 
-          url += "&p.showExpediteeAttributes=1";
+          //url += "&p.showExpediteeAttributes=1";
 
           iframe.src = url;
@@ -288 +301 @@
      
       }
+      
+      function getAssocFilePath(xmlUrl){
+      var assoc = "";
+      
+      \$.ajax({
+            type: "GET",
+            async: false,
+            url: xmlUrl,
+            dataType: "xml",
+            success: function(xml){
+                
+                                
+                \$(xml).find('metadata').each(function(){
+                    
+                    var name = \$(this).attr('name');
+                    
+                    if(name === 'assocfilepath'){
+                        if(assoc === ""){
+                            assoc = \$(this).text();
+                            //console.log(assoc);
+                        }
+                        
+                    }   
+                });
+                
+            }
+            
+          });
+          
+          return assoc;
+      }
 
     </script>