Changeset 9272

Timestamp:

2005-03-03T17:18:29+13:00 (19 years ago)

Author:

kjdon

Message:

made this inherit from AbstractSearch

File:

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

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

@@ -11 +11 @@
 
 import java.util.HashMap;
+import java.util.ArrayList;
 
 import org.apache.lucene.analysis.Analyzer;
@@ -31 +32 @@
 
 public class LuceneSearch 
-    extends ServiceRack {
+    extends AbstractSearch {
 
-    // the services on offer
-    // these strings must match what is found in the properties file
-    protected static final String TEXT_QUERY_SERVICE = "TextQuery";
+    protected static final String INDEX_ELEM = "index";
     
-    protected static final String QUERY_PARAM = "query";
-    
-    public boolean configure(Element info, Element extra_info) {
-    
-    System.out.println("Configuring LuceneSearch");
-    Element tq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
-    tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
-    tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
-    this.short_service_info.appendChild(tq_service);
-    
-    // look for format info 
-    String path = GSPath.appendLink(GSXML.SEARCH_ELEM, GSXML.FORMAT_ELEM);
-    Element format = (Element) GSXML.getNodeByPath(extra_info, path);
-    if (format != null) {
-        System.out.println("found format :"+this.converter.getString(format));
-        this.format_info_map.put(TEXT_QUERY_SERVICE, this.doc.importNode(format, true));
+    protected void getIndexData(ArrayList index_ids, ArrayList index_names, String lang) 
+    {
+    // the index info - read from config file - cache it??
+    Element index_list = (Element)GSXML.getChildByTagName(this.config_info, INDEX_ELEM+GSXML.LIST_MODIFIER);
+    if (index_list != null) {
+        NodeList indexes = index_list.getElementsByTagName(INDEX_ELEM);
+        int len = indexes.getLength();
+        // now add even if there is only one
+        for (int i=0; i<len; i++) {
+        Element index = (Element)indexes.item(i);
+        index_ids.add(index.getAttribute(GSXML.NAME_ATT));
+        index_names.add(GSXML.getDisplayText(index, GSXML.DISPLAY_TEXT_NAME, lang, "en"));
+        
+        }
+    } else {
+        // there is only one index, so we assume the default
+        index_ids.add("idx");
+        index_names.add("Default index");
     }
-        
-    return true;
+
     }
 
-    protected Element getServiceDescription(String service, String lang, String subset) {
-    
-    if (!service.equals(TEXT_QUERY_SERVICE)) {
-        return null;
-    }
-    Element tq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
-    tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
-    tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
-    if (subset==null || subset.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) {
-        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE+".name", lang)));
-        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE+".submit", lang)));
-        tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(TEXT_QUERY_SERVICE+".description", lang)));
-    }
-    if (subset==null || subset.equals(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER)) {
-        Element param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-        Element param = GSXML.createParameterDescription(this.doc, QUERY_PARAM, getTextString("param."+QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
-        param_list.appendChild(param);
-        tq_service.appendChild(param_list);
-    }
-    return tq_service;
-    }
-    
     /** Process a text query - implemented by concrete subclasses */
     protected Element processTextQuery(Element request) {
@@ -110 +88 @@
     }
 
+    // Get the index
+    String index = (String) params.get(INDEX_PARAM);
         try {
         String index_dir = GSFile.collectionIndexDir(this.site_home, this.cluster_name);
-        index_dir += File.separator+"idx";
+        index_dir += File.separator+index;
         Searcher searcher = new IndexSearcher(index_dir);
         Analyzer analyzer = new StandardAnalyzer();