Changeset 8162

Timestamp:

2004-09-27T16:12:54+12:00 (20 years ago)

Author:

nzdl

Message:

added in a very ugly hack to escape : if present in url - this interferes with url encoding for session handling. need to make this nicer and handle other characters too

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -232 +232 @@
             Element param = this.doc.createElement(GSXML.PARAM_ELEM);
             param.setAttribute(GSXML.NAME_ATT, name);
-            param.setAttribute(GSXML.VALUE_ATT, GSXML.xmlSafe((String)session.getAttribute(name)));
+            String value =  GSXML.xmlSafe((String)session.getAttribute(name));
+            // ugly hack to undo : escaping
+            value = value.replaceAll("%3A", "\\:");
+            param.setAttribute(GSXML.VALUE_ATT,value);
             xml_param_list.appendChild(param);
         }
@@ -251 +254 @@
     /** this goes through each URL and adds in a session id if needed--
      * its needed if the browser doesn't accept cookies
+     * also escapes things if needed
      */
     protected void encodeURLs(Element data, HttpServletResponse response) {
@@ -261 +265 @@
     for (int i=0; i<hrefs.getLength(); i++) {
         Element a = (Element)hrefs.item(i);
-        a.setAttribute("href", response.encodeURL(a.getAttribute("href")));
+        // ugly hack to get rid of : in the args - interferes with session handling
+        String href = a.getAttribute("href");
+        if (href.indexOf("?")!=-1) {
+        String[] parts = href.split("\\?", -1);
+        parts[1]=parts[1].replaceAll(":", "%3A");
+        href = parts[0]+"?"+parts[1];
+        }
+        a.setAttribute("href", response.encodeURL(href));
     }