Changeset 28295 for main/trunk

Timestamp:

2013-09-19T12:55:08+12:00 (11 years ago)

Author:

kjdon

Message:

we can't use getServletName() to work out the servlet name in URL (eg library) as the servlet name is the name from web.xml and may not be the same as the url path. So store library_name from the initialisation params and use that instead.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (4 diffs)

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

@@ -75 +75 @@
     protected String default_lang = null;
 
+  /** We record the library name for later */
+  protected String library_name = null;
     /** Whether or not client-side XSLT support should be exposed */
     protected boolean supports_client_xslt = false;
@@ -127 +129 @@
         //System.setProperty("java.util.prefs.PreferencesFactory", "org.greenstone.gsdl3.util.DisabledPreferencesFactory");
 
-        String library_name = config.getInitParameter(GSConstants.LIBRARY_NAME);
+        library_name = config.getInitParameter(GSConstants.LIBRARY_NAME);
         String interface_name = config.getInitParameter(GSConstants.INTERFACE_NAME);
 
@@ -756 +758 @@
         String requestedURL = request.getRequestURL().toString();
         String baseURL = "";
-        if (requestedURL.indexOf(this.getServletName()) != -1)
-        {
-            baseURL = requestedURL.substring(0, requestedURL.indexOf(this.getServletName()));
+        if (requestedURL.indexOf(library_name) != -1)
+        {
+            baseURL = requestedURL.substring(0, requestedURL.indexOf(library_name));
             xml_request.setAttribute("baseURL", baseURL);
         }
-
         String fullURL;
         if (request.getQueryString() != null)
@@ -873 +874 @@
                         queryString = "?" + request.getQueryString().replace("&", "&");
                     }
-                    urlParam.setAttribute(GSXML.VALUE_ATT, this.getServletName() + queryString);
+                    urlParam.setAttribute(GSXML.VALUE_ATT, library_name + queryString);
                     paramList.appendChild(urlParam);