Changeset 27817 for main/trunk

Timestamp:

2013-07-11T16:19:40+12:00 (11 years ago)

Author:

kjdon

Message:

testing for null to avoid exceptions

File:

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

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

@@ -115 +115 @@
             ArrayList<String> field_names = new ArrayList<String>();
             //field_names.add(getTextString("param.sortBy.rank", lang));
-            getSortData(fields, field_names, lang);
-
-            param = GSXML.createParameterDescription2(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, fields.get(0), fields, field_names);
+            if (getSortData(fields, field_names, lang)) {
+
+              param = GSXML.createParameterDescription2(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, fields.get(0), fields, field_names);
+            }
         }
         if (param != null)
@@ -130 +131 @@
     }
 
-  protected void getSortData(ArrayList<String> sort_ids, ArrayList<String> sort_names, String lang) {
+  protected boolean getSortData(ArrayList<String> sort_ids, ArrayList<String> sort_names, String lang) {
 
         Element sort_list = (Element) GSXML.getChildByTagName(this.config_info, SORT_ELEM + GSXML.LIST_MODIFIER);
+    if (sort_list == null) return false;
     NodeList sorts = sort_list.getElementsByTagName(SORT_ELEM);
     int len = sorts.getLength();
+    if (len == 0) return false;
     for (int i = 0; i < len; i++)
       {
@@ -152 +155 @@
         
       }
-    
+    return true;
   }
     protected void getSortByIndexData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang)