Changeset 25351

Timestamp:

2012-04-12T13:59:19+12:00 (12 years ago)

Author:

sjm84

Message:

Some fixes for LibraryServlet

File:

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

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

@@ -368 +368 @@
                 if (q.equals(GSParams.EXTERNAL_LINK_TYPE))
                 {
-                  el = queryMap.get(q)[0];
+                    el = queryMap.get(q)[0];
                 }
                 else if (q.equals(GSParams.HREF))
@@ -390 +390 @@
             {// This is an external link, 
 
-              if (el.equals("framed")) {
-                //TODO **** how best to change to a=p&sa=html&c=collection&url=href
-                // response.setContentType("text/xml");
-                //response.sendRedirect("http://localhost:8383/greenstone3/gs3library?a=p&sa=html&c=external&url="+href);
-              } else {
-                // el = '' or direct
-                //the web page is re-directed to the external URL (&el=&rl=0&href="http://...")
-                response.setContentType("text/xml");
-                response.sendRedirect(href);
-              }
+                if (el.equals("framed"))
+                {
+                    //TODO **** how best to change to a=p&sa=html&c=collection&url=href
+                    // response.setContentType("text/xml");
+                    //response.sendRedirect("http://localhost:8383/greenstone3/gs3library?a=p&sa=html&c=external&url="+href);
+                }
+                else
+                {
+                    // el = '' or direct
+                    //the web page is re-directed to the external URL (&el=&rl=0&href="http://...")
+                    response.setContentType("text/xml");
+                    response.sendRedirect(href);
+                }
             }
         }
@@ -701 +704 @@
 
         String requestedURL = request.getRequestURL().toString();
-        String baseURL = requestedURL.substring(0, requestedURL.indexOf(this.getServletName()));
-        xml_request.setAttribute("baseURL", baseURL);
+        String baseURL = "";
+        if (requestedURL.indexOf(this.getServletName()) != -1)
+        {
+            baseURL = requestedURL.substring(0, requestedURL.indexOf(this.getServletName()));
+            xml_request.setAttribute("baseURL", baseURL);
+        }
+
+        String fullURL;
+        if (request.getQueryString() != null)
+        {
+            fullURL = requestedURL + "?" + request.getQueryString();
+        }
+        else
+        {
+            fullURL = requestedURL;
+        }
+
         xml_request.setAttribute("remoteAddress", request.getRemoteAddr());
+        xml_request.setAttribute("fullURL", fullURL.replace("&", "&"));
 
         if (!runSecurityChecks(request, xml_request, userContext, out, baseURL, collection, document))
@@ -870 +889 @@
                     Element urlParam = this.doc.createElement(GSXML.PARAM_ELEM);
                     urlParam.setAttribute(GSXML.NAME_ATT, "redirectURL");
-                    urlParam.setAttribute(GSXML.VALUE_ATT, this.getServletName() + "?" + request.getQueryString().replace("&", "&"));
+                    if (request.getQueryString() != null && request.getQueryString().length() > 0)
+                    {
+                        urlParam.setAttribute(GSXML.VALUE_ATT, this.getServletName() + "?" + request.getQueryString().replace("&", "&"));
+                    }
+                    else
+                    {
+                        urlParam.setAttribute(GSXML.VALUE_ATT, this.getServletName());
+                    }
                     paramList.appendChild(urlParam);