Changeset 37363

Timestamp:

2023-02-28T11:59:57+13:00 (14 months ago)

Author:

kjdon

Message:

GSXML.extractParams will put namespaced params eg p.c into a sub-map. so can't just ask for param p.c

File:

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

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

@@ -56 +56 @@
                 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
                 String coll_name = (String)params.get(GSParams.COLLECTION);
-        if (coll_name == null)
-        {
-            logger.debug(" coll param is null, returning");
-            return;
+        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);
+                  }
+                }
+
+                if (coll_name == null || coll_name.equals(""))
+                {
+                  logger.debug(" coll/p.c params both empty, not adding extra info");
+                  return;
         }
 
         UserContext userContext = new UserContext(page_request);
-
-        if (coll_name.equals(""))
-        {
-                  coll_name = (String)params.get("p.c");
-        }
 
         boolean get_service_description = false;