Changeset 33719 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

Timestamp:

2019-11-25T10:46:36+13:00 (4 years ago)

Author:

kjdon

Message:

fixed up processRedirectRequest method. for some reason parts had been commented out - just my testing?? - so put that back. And implemented el=framed portion

File:

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

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

@@ -35 +35 @@
 
 import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
@@ -425 +426 @@
     if (processRedirectRequest(request, response, queryMap)) {
     // this method will do the redirect if needed and return true if it has
-    // if el=direct/framed&rl=0&href=http://newurl.com
+    // done so. 
+    // e.g. el=direct/framed&rl=0&href=http://newurl.com
     return;
     }
@@ -859 +861 @@
     String rl = null;
     String el = null;
+    String collection = null;
 
     while (queryIter.hasNext())
     {
         String q = queryIter.next();
-        if (q.equals(GSParams.EXTERNAL_LINK_TYPE))
+        if (q.equals(GSParams.COLLECTION))
+        {
+        collection = queryMap.get(q)[0];
+        }
+        else if (q.equals(GSParams.EXTERNAL_LINK_TYPE))
         {
         el = queryMap.get(q)[0];
@@ -885 +892 @@
     //"rl=1" this is an internal link
     if ((href != null) && (rl.equals("0")))
-      {// This is an external link, 
+    {// 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);
-          }
+        {
+        // framed means we are linking to an external page inside our greenstone page
+        HttpSession session = request.getSession();
+        ServletContext context = session.getServletContext();
+        String new_url = context.getContextPath()+"/"+ library_name+"?a=p&sa=html&url="+href;
+        if (collection != null && !collection.equals("")) {
+            new_url += "&c="+collection;
+        }
+        response.sendRedirect(new_url);
+        }
         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);
-          }
+        response.sendRedirect(href);
+        }
         return true;
       }