Changeset 13976 for trunk

Timestamp:

2007-03-14T11:25:14+13:00 (17 years ago)

Author:

kjdon

Message:

now have a new variable coll_ids_list_no_all - the list of collections without the 'all' option. use this as the list when the collection param is empty or all - don't want to send a request to all/TextQuery

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/CrossCollectionSearch.java (modified) (3 diffs)

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

@@ -51 +51 @@
     
     protected String [] coll_ids_list = null;
+    protected String [] coll_ids_list_no_all = null;
     protected String [] coll_names_list = null;
 
@@ -148 +149 @@
 
     // get the collection list
-    String [] colls_list;
+    String [] colls_list = coll_ids_list_no_all;
     Element coll_param = GSXML.getNamedElement(param_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT,  COLLECTION_PARAM);
-    if (coll_param == null) {
-        colls_list = coll_ids_list;
-    } else {
+    if (coll_param != null) {
         String coll_list = GSXML.getValue(coll_param);
-        if (coll_list.equals("all") || coll_list.equals("")) {
-        colls_list = coll_ids_list;
-        } else {
+        if (!coll_list.equals("all") &&  !coll_list.equals("")) {
         colls_list = coll_list.split(",");
         }
@@ -283 +280 @@
         return false;
     }
+    // ids no all has the list without 'all' option.
+    this.coll_ids_list_no_all = new String[1];
+    this.coll_ids_list_no_all = (String []) valid_colls.toArray(coll_ids_list_no_all);
+    
     valid_colls.add(0, "all");
     valid_coll_names.add(0, getTextString("param."+COLLECTION_PARAM+".all", "en" ));