Changeset 31137 for main

Timestamp:

2016-11-22T11:24:48+13:00 (7 years ago)

Author:

kjdon

Message:

can't use a HashMap to store two params with the same name. doh. lets just add them individually

File:

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

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

@@ -148 +148 @@
         //ADD SITE METADATA
         Element metadata_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext);
-        //create a hashmap of params
-        HashMap subset_params = new HashMap(2);
-        subset_params.put(GSXML.SUBSET_PARAM, GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
-        subset_params.put(GSXML.SUBSET_PARAM, GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
         //create the element to put the params in
         Element param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
-        //put them in
-        GSXML.addParametersToList(param_list, subset_params);
+        // want to get metadataList and displayItemList
+        GSXML.addParameterToList(param_list, GSXML.SUBSET_PARAM , GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        GSXML.addParameterToList(param_list, GSXML.SUBSET_PARAM , GSXML.DISPLAY_TEXT_ELEM  + GSXML.LIST_MODIFIER);
+        
         metadata_request.appendChild(param_list);
         //create the message
@@ -165 +163 @@
         Element metadata_response = (Element) GSXML.getChildByTagName(metadata_response_message, GSXML.RESPONSE_ELEM);
         //merge in metadata
-        // *************** need to merge the displayITem lists too
+        // *************** need to merge the displayItem lists too
         GSXML.mergeMetadataLists(element, metadata_response);
         GSXML.mergeSpecifiedLists(element, metadata_response, GSXML.DISPLAY_TEXT_ELEM);