Changeset 31344

Timestamp:

2017-01-24T03:49:38+13:00 (7 years ago)

Author:

Georgiy Litvinov

Message:

Update to previous commit

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/CrossCollectionSearch.java

@@ -30 +30 @@
 import org.greenstone.gsdl3.util.UserContext;
 import org.greenstone.gsdl3.util.XMLConverter;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -505 +504 @@
     private String[] mergeGroups(UserContext userContext, Element paramList, String[] collArray){
         Document doc = XMLConverter.newDOM();
-        
+        boolean allSelected = false;
         Element groupParamList = extractGroupParams(paramList, collArray, doc);     
-        
         Element collParam = GSXML.getNamedElement(paramList, GSXML.PARAM_ELEM, GSXML.NAME_ATT, COLLECTION_PARAM);
-        boolean allSelected = GSXML.getValue(collParam).matches(".*\\ball\\b.*");
+        if (collParam != null) {
+            String collValue = GSXML.getValue(collParam);
+            if (collValue != null) {
+                allSelected = collValue.matches(".*\\ball\\b.*");
+            }
+        }
         //Group param not empty and coll param null or not 'all'
         if ( allSelected || !groupParamList.hasChildNodes())