Changeset 13127

Timestamp:

2006-10-18T17:02:02+13:00 (18 years ago)

Author:

kjdon

Message:

now look for indexOptionList in the config file - currently two options, maxnumeric (currently stored but not used yet) and stemIndexes - determines whether stem, case and accentfold indexes are available. these parameters for the search form are now dependent on this option.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractMGPPSearch.java (modified) (8 diffs)

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

@@ -68 +68 @@
     private static final String FIELD_STEM_PARAM = "fqs";
     private static final String FIELD_CASE_PARAM = "fqc";
+    private static final String FIELD_ACCENT_PARAM="fqa";
     private static final String FIELD_FIELD_PARAM = "fqf";
     private static final String FIELD_COMBINE_PARAM = "fqk";
@@ -73 +74 @@
     private static final String FIELD_COMBINE_PARAM_OR = "1";
     private static final String FIELD_COMBINE_PARAM_NOT = "2";
+   
+    private static final String ACCENT_PARAM="accent";
 
     // some stuff for config files
@@ -84 +87 @@
     protected static final String LEVEL_ELEM = "level";
 
+    protected static final String STEMINDEX_OPTION = "stemIndexes";
+    protected static final String MAXNUMERIC_OPTION = "maxnumeric";
+
     protected static final String EQUIV_TERM_ELEM = "equivTerm";
 
@@ -106 +112 @@
     private boolean advanced_form_search = false;
 
+    // stem indexes available
+    private boolean does_case=true;
+    private boolean does_stem=true;
+    private boolean does_accent=false;
+    
+    // maxnumeric - not used yet. needs to be passed to MGPPWrapper.
+    private int maxnumeric = 4;
+
     /** the stem used for the index files */
     protected String index_stem = null;
@@ -142 +156 @@
     }
     if (this.index_stem == null || this.index_stem.equals("")) {
-        logger.error("AbstractMGPPSearch.configure(): indexStem element not found, stem will default to collection name");
+        logger.warn("AbstractMGPPSearch.configure(): indexStem element not found, stem will default to collection name");
         this.index_stem = this.cluster_name;
+    }
+
+    // get index options
+    Element index_option_list = (Element) GSXML.getChildByTagName(info, GSXML.INDEX_OPTION_ELEM + GSXML.LIST_MODIFIER);
+    if (index_option_list != null) {
+        NodeList options = index_option_list.getElementsByTagName(GSXML.INDEX_OPTION_ELEM);
+        for (int i=0; i<options.getLength(); i++) {
+        Element opt = (Element)options.item(i);
+        String name = opt.getAttribute(GSXML.NAME_ATT);
+        String value = opt.getAttribute(GSXML.VALUE_ATT);
+        if (name.equals(MAXNUMERIC_OPTION)) {
+            int maxnum = Integer.parseInt(value);
+            if (4 <= maxnum && maxnum < 512) {
+            maxnumeric = maxnum;
+            }
+        }
+        else if (name.equals(STEMINDEX_OPTION)) {
+            int stemindex = Integer.parseInt(value);
+            // stem and case are true by default, accent folding false by defualt
+            if ((stemindex & 1) == 0) {
+            does_case = false;
+            }
+            if ((stemindex & 2) == 0) {
+            does_stem = false;
+            }
+            if ((stemindex & 4) != 0) {
+            does_accent = true;
+            }
+        }
+        }
     }
 
@@ -295 +339 @@
         param_list.appendChild(multiparam);
         
-        createParameter(FIELD_COMBINE_PARAM, multiparam,  lang);
-        createParameter(FIELD_QUERY_PARAM, multiparam,  lang);
-        createParameter(FIELD_CASE_PARAM, multiparam,  lang);
-        createParameter(FIELD_STEM_PARAM, multiparam,  lang);
-        createParameter(FIELD_FIELD_PARAM, multiparam,  lang);    
+        createParameter(FIELD_COMBINE_PARAM, multiparam, lang);
+        createParameter(FIELD_QUERY_PARAM, multiparam, lang);
+        if (this.does_case) {
+            createParameter(FIELD_CASE_PARAM, multiparam, lang);
+        }
+        if (this.does_stem) {
+            createParameter(FIELD_STEM_PARAM, multiparam, lang);
+        }
+        if (this.does_accent) {
+            createParameter(FIELD_ACCENT_PARAM, multiparam, lang);
+        }
+        createParameter(FIELD_FIELD_PARAM, multiparam, lang);    
         
         } 
@@ -311 +362 @@
     {
     createParameter(LEVEL_PARAM, param_list, lang);
-    createParameter(CASE_PARAM, param_list, lang);
-    createParameter(STEM_PARAM, param_list, lang);
+    if (this.does_case){
+        createParameter(CASE_PARAM, param_list, lang);
+    }
+    if (this.does_stem){
+        createParameter(STEM_PARAM, param_list, lang);
+    }
+    if (this.does_accent){
+        createParameter(ACCENT_PARAM, param_list, lang);
+    }
     createParameter(MATCH_PARAM, param_list, lang);
     createParameter(RANK_PARAM, param_list, lang);
-
     }
 
@@ -341 +398 @@
         
         
-    } else if (name.equals(FIELD_CASE_PARAM) || name.equals(FIELD_STEM_PARAM)) {
+    } else if (name.equals(FIELD_CASE_PARAM) || name.equals(FIELD_STEM_PARAM) || name.equals(FIELD_ACCENT_PARAM)) {
         String[] bool_ops = {"0", "1"};
         String[] bool_texts = {getTextString("param.boolean.off", lang, "AbstractSearch"),getTextString("param.boolean.on", lang, "AbstractSearch")};