Changeset 32767 for main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js

Timestamp:

2019-02-12T11:11:47+13:00 (5 years ago)

Author:

kjdon

Message:

tomcat 8 change - it didn't like unescaped chars in the inline templates. so we need to do more esacping

File:

• main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js (modified) (7 diffs)

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

@@ -24 +24 @@
 * EXPANSION SCRIPTS *
 ********************/
+
+function makeURLSafe(url) {
+
+    url =  url.replace(/ /g, "%20").replace(/\//g, "%2F").replace(/\:/g, "%3A").replace(/=/g, "%3D").replace(/\[/g,"%5B").replace(/\]/g,"%5D");
+    return url;
+}
 
 function getTextForSection(sectionID, callback)
@@ -40 +46 @@
     template +=   '</text>';
     template += '</xsl:template>';
-
+    
+    template = makeURLSafe(template);
+    
     var hlCheckBox = document.getElementById("highlightOption");
     
@@ -56 +64 @@
     }
     
-    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + sectionID + "?ed=1&hl=" + hl + "&ilt=" + template.replace(" ", "%20");
+    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + sectionID + "?ed=1&hl=" + hl + "&ilt=" + template;
     if (gs.cgiParams.p_s && gs.cgiParams.p_s.length > 0) {
     url += "&p.s=" + gs.cgiParams.p_s;
@@ -109 +117 @@
     template += '</xsl:template>';
 
-    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + sectionID + "?ilt=" + template.replace(" ", "%20");
+    template = makeURLSafe(template);
+    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + sectionID + "?ilt=" + template;
 
        if(gs.documentMetadata.docType == "paged")
@@ -677 +686 @@
     ilt += '</xsl:template>';
     
-    var url = gs.xsltParams.library_name + "?a=d&ec=1&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&ilt=" + ilt.replace(/ /g, "%20");
+    ilt = makeURLSafe(ilt);
+
+
+    var url = gs.xsltParams.library_name + "?a=d&ec=1&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&ilt=" + ilt;
 
     $.ajax(url)
@@ -939 +951 @@
         template +=   '</html>';
         template += '</xsl:template>';
-
-        var url = href + "?noText=1&ilt=" + template.replace(" ", "%20");
+    template = makeURLSafe(template);
+        var url = href + "?noText=1&ilt=" + template;
+
         $.ajax(url)
         .success(function(text)
@@ -1342 +1355 @@
     template +=   ']</images>';
     template += '</xsl:template>';
-
-    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + gs.cgiParams.d + "?ed=1&ilt=" + template.replace(" ", "%20");
+    template = makeURLSafe(template);
+    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + gs.cgiParams.d + "?ed=1&ilt=" + template;
 
     $.ajax(