Changeset 3851 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Search.java

Timestamp:

2003-03-11T16:58:35+13:00 (21 years ago)

Author:

kjdon

Message:

a wide variety of changes, next I will go through and make sure the code is tidy, nad tidy up teh xml a bit, but I wanted to check in all this first.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Search.java (modified) (7 diffs)

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

@@ -30 +30 @@
 /**
  *
- * @author <a href="mailto:[email protected]">Katherine Don</a>
+ * @author <a href="mailto:[email protected]">Michael Dewsnip</a>
  * @version $Revision$
  */
@@ -42 +42 @@
 
     // Parameters used
+    protected static final String INDEX_PARAM = "index";
     protected static final String CASE_PARAM = "case";
     protected static final String STEM_PARAM = "stem";
@@ -58 +59 @@
     protected static final String FREQ_ATT = "freq";
 
+    // Elements used in the config file that are specific to this class
+    protected static final String DEFAULT_INDEX_ELEM = "defaultIndex";
+    protected static final String DEFAULT_LEVEL_ELEM = "defaultLevel";
+    protected static final String INDEX_ELEM = "index";
+    protected static final String LEVEL_ELEM = "level";
+
     protected GDBMWrapper gdbm_src_ = null;
 
     protected Element config_info_ = null;
+
+    /** the default index */
+    protected String default_index_ = null;
 
 
@@ -75 +85 @@
     System.out.println("Configuring GS2Search...");
     config_info_ = info;
+
+    // Get the default index out of <defaultIndex> (buildConfig.xml)
+    Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_INDEX_ELEM);
+    if (def != null) {
+        default_index_ = def.getAttribute(GSXML.NAME_ATT);
+    }
+    if (default_index_ == null || default_index_.equals("")) {
+        System.err.println("Error: default index not specified!");
+        return false;
+    }
 
     // these entries should reflect the build config file - some services may not be available depending on how the colleciton was built.
@@ -103 +123 @@
 
     /** creates a new param element and adds it to the param list */
-    protected void createParameter(String name, Element param_list, boolean display,
-                   String lang)
+    protected void createParameter(String name, Element param_list, 
+                   boolean display, String lang)
     {
     Element param=null;
@@ -162 +182 @@
      * otherwise it creates the description version
      */
-    protected boolean createTextQueryParamList(Element param_list, boolean display,
-                           String lang)
-    {
-    // the order they are specified here is the order they appear on 
-    // the query form
-    createParameter(CASE_PARAM, param_list, display, lang);
-    createParameter(STEM_PARAM, param_list, display, lang);
-    createParameter(MATCH_PARAM, param_list, display, lang);
-    createParameter(MAXDOCS_PARAM, param_list, display, lang);
-    createParameter(QUERY_PARAM, param_list, display, lang);
-    return true;
-    }
-
+    protected abstract boolean createTextQueryParamList(Element param_list, 
+                            boolean display,
+                            String lang);
 
     /** creates a display element containing all the text strings needed to display
@@ -182 +192 @@
     // Create a service display for the basic text query service
     Element display = doc_.createElement(GSXML.DISPLAY_ELEM);
-    display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_NAME_ELEM,
-                            getTextString(service+".name", lang)));
-    display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_SUBMIT_ELEM,
-                            getTextString(service+".submit", lang)));
+    display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_NAME_ELEM, getTextString(service+".name", lang)));
+    display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_SUBMIT_ELEM, getTextString(service+".submit", lang)));
 
     // now need to add in the params