Changeset 32646 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/URLFilter.java

Timestamp:

2018-12-03T13:07:00+13:00 (5 years ago)

Author:

kjdon

Message:

we are now putting group info into restful url, eg library/group/MyGroup/SubGroup, or library/collection/MyGroup/collname

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/URLFilter.java (modified) (8 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/URLFilter.java

@@ -4 +4 @@
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -20 +21 @@
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+
 import org.apache.log4j.Logger;
 import org.greenstone.gsdl3.util.GSParams;
@@ -49 +52 @@
     protected static final String DOCUMENT_PATH = "document";
     protected static final String COLLECTION_PATH = "collection";
+  protected static final String GROUP_PATH = "group";
     protected static final String PAGE_PATH = "page";
     protected static final String SYSTEM_PATH = "system";
+  protected static final String BROWSE_PATH = "browse";
+  protected static final String SEARCH_PATH = "search";
 
     protected static final String METADATA_RETRIEVAL_SERVICE = "DocumentMetadataRetrieve";
@@ -83 +89 @@
             GSHttpServletRequestWrapper gRequest = new GSHttpServletRequestWrapper(hRequest);
 
+            // this is the part before the ?
             String url = hRequest.getRequestURI().toString();
 
@@ -235 +242 @@
             else
             {
+              ArrayList<String> keywords = new ArrayList<String>();
+              keywords.add(PAGE_PATH);
+              keywords.add(BROWSE_PATH);
+              keywords.add(SEARCH_PATH);
                 //If we have a jsessionid on the end of our URL we want to ignore it
                 int index;
@@ -246 +257 @@
                     String[] additionalParameters = null;
                     String[] defaultParamValues = null;
-
                     //COLLECTION
-                    if (segments[i].equals(COLLECTION_PATH) && (i + 1) < segments.length)
-                    {
-                        gRequest.setParameter(GSParams.COLLECTION, segments[i + 1]);
-                    }
+                    if (segments[i].equals(COLLECTION_PATH) && (i + 1) < segments.length) {
+                      int j=i+1;
+                      while(j+1 < segments.length && !keywords.contains(segments[j+1])) {
+                        j++;
+                      }
+                      
+                      if (j>i+1) {
+                        // we had a group part
+                        String [] groups = Arrays.copyOfRange(segments, i+1, j);
+                        String group = StringUtils.join(groups, "/");
+                        gRequest.setParameter(GSParams.GROUP, group);
+                      }
+                      gRequest.setParameter(GSParams.COLLECTION, segments[j]);
+                    }
+                    // GROUP
+                    else if(segments[i].equals(GROUP_PATH) && (i + 1) < segments.length)
+                      {
+                        // assume for now, no other path parts for group links
+                        int j= segments.length - 1;
+                        String group;
+                        if (j==i+1) {
+                          group = segments[j];
+                        } else {
+                          String [] groups = Arrays.copyOfRange(segments, i+1, j+1);
+                          group = StringUtils.join(groups, "/");
+                        }
+                        gRequest.setParameter(GSParams.GROUP, group);
+                        gRequest.setParameter(GSParams.ACTION, "p");
+                        gRequest.setParameter(GSParams.SUBACTION, "home");
+                        
+                      }
                     //DOCUMENT
                     else if (segments[i].equals(DOCUMENT_PATH) && (i + 1) < segments.length)
@@ -317 +354 @@
                     }
                     //BROWSE
-                    else if (segments[i].equals("browse") && (i + 1) < segments.length)
+                    else if (segments[i].equals(BROWSE_PATH) && (i + 1) < segments.length)
                     {
                         String cl = "";
@@ -361 +398 @@
                     }
                     //QUERY
-                    else if (segments[i].equals("search"))
+                    else if (segments[i].equals(SEARCH_PATH))
                     {
                         String serviceName = "";