Changeset 38828 for main/trunk/greenstone3/src

Timestamp:

2024-03-11T12:24:06+13:00 (3 months ago)

Author:

kjdon

Message:

when looking for group, check the group param but also p.group - eg favourites uses p.c and p.group to store which collection one has come from into the favourites list

File:

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

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

@@ -55 +55 @@
         }
                 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
+        HashMap<String,String> prev_params = (HashMap<String,String>)params.get(GSParams.PREVIOUS_PREFIX);
                 String coll_name = (String)params.get(GSParams.COLLECTION);
         if (coll_name == null || coll_name.equals(""))
         {
                   // try p.c
-                  HashMap<String,String> prev_params = (HashMap<String,String>)params.get(GSParams.PREVIOUS_PREFIX);
                   if (prev_params != null) {
                     coll_name = prev_params.get(GSParams.COLLECTION);
@@ -116 +116 @@
                 // have we got group param, and pathList??
                 String group = (String)params.get(GSParams.GROUP);
+        if (group == null || group.equals("")) {
+            // try p.group
+            if (prev_params != null) {
+            group = prev_params.get(GSParams.GROUP);
+            }
+
+        }
                 if (group != null && !group.equals("")) {
                   // ...yes we do. add group path info if not already present