Changeset 27950

Timestamp:

2013-08-01T15:17:17+12:00 (10 years ago)

Author:

kjdon

Message:

check that we actually have stem/case/accentfold before setting them - if we set accentfold to true and we have no accent fold, its trying to open a stem index that doesn't exist, and then you get no stemming or case folding at all

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java

@@ -101 +101 @@
         mgpp_src.setQueryLevel(this.default_level);
         // we have case folding on by default
-        mgpp_src.setCase(case_default.equals(BOOLEAN_PARAM_ON) ? true : false);
-        mgpp_src.setStem(stem_default.equals(BOOLEAN_PARAM_ON) ? true : false);
-        mgpp_src.setAccentFold(accent_default.equals(BOOLEAN_PARAM_ON) ? true : false);
-
+        if (this.does_case) {
+          mgpp_src.setCase(case_default.equals(BOOLEAN_PARAM_ON) ? true : false);
+        }
+        if (this.does_stem) {
+          mgpp_src.setStem(stem_default.equals(BOOLEAN_PARAM_ON) ? true : false);
+        }
+        if (this.does_accent) {
+          mgpp_src.setAccentFold(accent_default.equals(BOOLEAN_PARAM_ON) ? true : false);
+        }
         // set up the query params
         Set entries = params.entrySet();
@@ -117 +122 @@
             String value = (String) m.getValue();
 
-            if (name.equals(CASE_PARAM))
+            if (name.equals(CASE_PARAM) && this.does_case)
             {
                 boolean val = (value.equals(BOOLEAN_PARAM_ON) ? true : false);
                 mgpp_src.setCase(val);
             }
-            else if (name.equals(STEM_PARAM))
+            else if (name.equals(STEM_PARAM) && this.does_stem)
             {
                 boolean val = (value.equals(BOOLEAN_PARAM_ON) ? true : false);
                 mgpp_src.setStem(val);
             }
-            else if (name.equals(ACCENT_PARAM))
+            else if (name.equals(ACCENT_PARAM) && this.does_accent)
             {
                 boolean val = (value.equals(BOOLEAN_PARAM_ON) ? true : false);