Changeset 8954

Timestamp:

2005-02-02T14:46:07+13:00 (19 years ago)

Author:

kjdon

Message:

if no field specified, use the default field (the first one in the list) rather than assuming ZZ which may not be there

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java (modified) (5 diffs)

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

@@ -75 +75 @@
     private static final String SEARCH_TYPE_PLAIN = "plain";
     private static final String SEARCH_TYPE_FORM = "form";
-    private static final String SEARCH_TYPE_FORM_SIMPLE = "simple";
+    private static final String SEARCH_TYPE_FORM_SIMPLE = "simple";
     private static final String SEARCH_TYPE_FORM_ADVANCED = "advanced";
 
@@ -88 +88 @@
     // the default level for retrieval - and we'll use it for searching too
     private String default_level=null;
+    // the default field for searching
+    private String default_field = null;
     // which search services will we offer??
     private boolean plain_search = false;
@@ -97 +99 @@
     {
     this.mgpp_src = new MGPPWrapper();
+    this.dictionary_name = "MGPPSearch";
     }
 
@@ -176 +179 @@
         return true;
     }
+    // find the default field - use the first one
+    Element first_field = (Element)GSXML.getChildByTagName(field_list, GSXML.FIELD_ELEM);
+    default_field = first_field.getAttribute(GSXML.NAME_ATT);
     // else set up the fielded query services
     
@@ -460 +466 @@
     }
 
-    // If an field hasn't been specified, use all fields
+    // If a field hasn't been specified, use the default
     String field = (String) params.get(INDEX_FIELD_PARAM); 
     if (field == null) {
-        field = "ZZ";
+        field = default_field;
     }