Changeset 13927

Timestamp:

2007-02-19T10:55:25+13:00 (17 years ago)

Author:

kjdon

Message:

now uses a default index if no index param is specified for a query

File:

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

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

@@ -40 +40 @@
     protected static final String INDEX_ELEM = "index";
     
+    public boolean configure(Element info, Element extra_info) {
+    if (!super.configure(info, extra_info)){
+        return false;
+    }
+    
+    default_index = "idx";
+    return true;
+    }
+    
     protected void getIndexData(ArrayList index_ids, ArrayList index_names, String lang) 
     {
@@ -56 +65 @@
     } else {
         // there is only one index, so we assume the default
-        index_ids.add("idx");
+        index_ids.add(this.default_index);
         index_names.add("Default index");
     }
@@ -94 +103 @@
     // Get the index
     String index = (String) params.get(INDEX_PARAM);
+    if (index == null || index.equals("")) {
+        index = this.default_index; // assume the default
+    }
         try {
         String index_dir = GSFile.collectionIndexDir(this.site_home, this.cluster_name);