Changeset 36648

Timestamp:

2022-09-21T09:43:32+12:00 (19 months ago)

Author:

kjdon

Message:

made this a bit tidier. configure now gets the groupinfoservicename. we use that to determine whether to query MR for collection list, or the group service. if we are just querying mr, then add collectionlist param to main request - saves making another request for it later.

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java

@@ -5 +5 @@
 
 import org.apache.log4j.Logger;
+import org.greenstone.gsdl3.core.MessageRouter;
 import org.greenstone.gsdl3.service.CollectionGroups;
 import org.greenstone.gsdl3.util.GSParams;
@@ -31 +32 @@
   protected String groupInfoServiceName = null;
 
+  public boolean configure() {
+
+    // work out if we have a collection group service or not
+      if (this.mr instanceof MessageRouter && ((MessageRouter)this.mr).pingModule(CollectionGroups.GROUP_CONTENT_SERVICE)) {
+        this.groupInfoServiceName = CollectionGroups.GROUP_CONTENT_SERVICE;
+      } else {
+        this.groupInfoServiceName = "NO_GROUPS";
+      }
+      
+
+    return true;
+  }
+  
   public Node process(Node message_node)
     
@@ -130 +144 @@
     }
 
-    // is this collection part of a group? 
-    String group = (String) params.get(GSParams.GROUP);
-    if (group != null && !group.equals("")) {
-      // ...yes it is. get the group path info
-      Element group_info_response = getGroupInfo(group, userContext); 
-      Element path_list = (Element) GSXML.getChildByTagName(group_info_response,
-                                GSXML.PATH_ELEM + GSXML.LIST_MODIFIER);
-      if (path_list != null) {
-    response.appendChild(response.getOwnerDocument().importNode(path_list, true));
-      }
-    }
-
     if (page_name.equals(ABOUT_PAGE)) {
       // get service descriptions. Actually only want displayItems, but get everything for now
@@ -181 +183 @@
 
     UserContext userContext = new UserContext(request);
+
+
     // first, get the message router info
     Element info_message = doc.createElement(GSXML.MESSAGE_ELEM);
@@ -187 +191 @@
     Element param_list_element = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
     info_request.appendChild(param_list_element);
-    //Describe params without collectionlist. Collectionlist provided by CollectionGroup service
+
     GSXML.addParameterToList(param_list_element, GSXML.SUBSET_PARAM, GSXML.CLUSTER_ELEM + GSXML.LIST_MODIFIER);
     GSXML.addParameterToList(param_list_element, GSXML.SUBSET_PARAM, GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
@@ -193 +197 @@
     GSXML.addParameterToList(param_list_element, GSXML.SUBSET_PARAM, GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
     GSXML.addParameterToList(param_list_element, GSXML.SUBSET_PARAM, GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
+
+    // are we using collection groups?
+    // if not, get the coll list from MR
+    if (this.groupInfoServiceName.equals ("NO_GROUPS")) {
+      GSXML.addParameterToList(param_list_element, GSXML.SUBSET_PARAM, GSXML.COLLECTION_ELEM + GSXML.LIST_MODIFIER);
+    }
     info_message.appendChild(info_request);
     //Send request to message router
@@ -221 +231 @@
     }
 
-    // if we haven't done so already, check for group info type service
-    if (this.groupInfoServiceName ==  null) {
-      Element groupInfoService = GSXML.getNamedElement(resp_service_list, GSXML.SERVICE_ELEM, GSXML.NAME_ATT, CollectionGroups.GROUP_CONTENT_SERVICE);
-          
-      if (groupInfoService != null) {
-    this.groupInfoServiceName = CollectionGroups.GROUP_CONTENT_SERVICE; 
-      } else {
-    this.groupInfoServiceName = "NO_GROUPS";
-      }
-    }
-  
+    // if we are using the group service, get all the group info now
     if (!this.groupInfoServiceName.equals("NO_GROUPS")) {
       String group = null;
@@ -265 +265 @@
       }
           
-    } else {
-
-      //TODO: if no groups, then add the param into main request and get it with the other stuff.
-      // don't need to do a separate request.
-      // If no service with type SERVICE_TYPE_GROUPINFO could be provided
-      // request message router for all available collections
-      GSXML.addParameterToList(param_list_element, GSXML.SUBSET_PARAM,
-                   GSXML.COLLECTION_ELEM + GSXML.LIST_MODIFIER);
-      info_response_message = (Element) this.mr.process(info_message);
-
-      if (info_response_message == null) {
-    logger.error(" couldn't query the message router!");
-    return null;
-      }
-      info_response = (Element) GSXML.getChildByTagName(info_response_message, GSXML.RESPONSE_ELEM);
-      if (info_response == null) {
-    logger.error("couldn't query the message router!");
-    return null;
-      }
     }