Changeset 9902

Timestamp:

2005-05-17T14:22:58+12:00 (19 years ago)

Author:

kjdon

Message:

added back in teh default index stuff - wasn't being used in the index param description

Location:

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

Files:

• AbstractMGPPSearch.java (modified) (3 diffs)
• AbstractMGSearch.java (modified) (4 diffs)
• AbstractSearch.java (modified) (2 diffs)
• IViaSearch.java (modified) (1 diff)

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

@@ -95 +95 @@
     private MGPPWrapper mgpp_src=null;
 
-     /** the default index */
-    protected String default_index = null;
    // the default level for retrieval - and we'll use it for searching too
     private String default_level=null;
@@ -134 +132 @@
     if (def != null) {
         this.default_index = def.getAttribute(GSXML.NAME_ATT);
-    }
-    if (this.default_index == null || this.default_index.equals("")) {
-        System.err.println("Error: default index not specified!");
-        return false;
-    }
+    } // otherwise its "" and will be the first one in the list
+    
     // the index stem is either specified in the config file or is "index"
     Element index_stem_elem = (Element) GSXML.getChildByTagName(info, INDEX_STEM_ELEM);
@@ -149 +144 @@
     }
 
-        // the generic config has set up the text query service, but we may not want it
+    // the generic config has set up the text query service, but we may not want it
     Element search_type_list = (Element) GSXML.getChildByTagName(info, SEARCH_TYPE_ELEM + GSXML.LIST_MODIFIER);
     if (search_type_list == null) {

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

@@ -65 +65 @@
     protected static final String INDEX_ELEM = "index";
 
-    /** the default index */
-    protected String default_index = null;
     /** the stem used for the index files */
     protected String index_stem = null;
@@ -93 +91 @@
     if (def != null) {
         this.default_index = def.getAttribute(GSXML.NAME_ATT);
-    }
-    if (this.default_index == null || this.default_index.equals("")) {
-        System.err.println("Error: default index not specified!");
-        return false;
-    }
+    } // otherwise will be "", and the first one will be the default
 
     // the index stem is either the collection name or is specified in the config file
@@ -148 +142 @@
     }
 
-    protected void getIndexData(ArrayList index_ids, ArrayList index_names, String lang) 
-    {
-    // the index info - read from config file - cache it??
+    protected void getIndexData(ArrayList index_ids, ArrayList index_names, String lang) {
+    // the index info -
     Element index_list = (Element)GSXML.getChildByTagName(this.config_info, INDEX_ELEM+GSXML.LIST_MODIFIER);
     NodeList indexes = index_list.getElementsByTagName(INDEX_ELEM);
@@ -163 +156 @@
 
     }
-
     /** do the actual query */
     protected Element processTextQuery(Element request) 

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

@@ -71 +71 @@
      */
     protected String default_document_type = null;
+    /** the default index, or comma separated list if more than one is 
+     * the default (with start and end commas, eg ,TI,SU,). 
+     * Should be set by configure()
+     */
+    protected String default_index = "";
 
     public AbstractSearch()
@@ -207 +212 @@
         param_type = GSXML.PARAM_TYPE_ENUM_MULTI;
         }
-        param = GSXML.createParameterDescription2(this.doc, INDEX_PARAM, getTextString("param."+INDEX_PARAM, lang), param_type, /*this.default_index*/"", index_ids, index_names);
+        param = GSXML.createParameterDescription2(this.doc, INDEX_PARAM, getTextString("param."+INDEX_PARAM, lang), param_type, this.default_index, index_ids, index_names);
         param_list.appendChild(param);
     } else if (name.equals(MAXDOCS_PARAM)) {

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

@@ -51 +51 @@
     does_paging = true;
     does_multi_index_search = true;
+    this.default_index = ",kw,au,su,ti,de,fu,"; // all of them
     return super.configure(info, extra_info);
     }