Changeset 28221 for main/trunk/greenstone2/runtime-src/src/recpt/querytools.cpp

Timestamp:

2013-09-05T13:35:43+12:00 (11 years ago)

Author:

kjdon

Message:

tidying up for case/accent/stem checkboxes in advance mgpp search form. adding in accent fold one. making these boxes display or not based on whether these options are available in the collection

File:

• main/trunk/greenstone2/runtime-src/src/recpt/querytools.cpp (modified) (6 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/querytools.cpp

@@ -519 +519 @@
 }
 
-// Parses the terms into words, and adds #si if necessary
-text_t addstemcase(const text_t &terms, const text_t &stem, const text_t &fold,
+// Parses the terms into words, and adds #sif if necessary
+text_t addstemcase(const text_t &terms, const text_t &stem, const text_t &casefold, const text_t &accentfold,
            const int indexer_type) {
   
-  // the default stem and case are set to 0 if this is being used, so we are only adding on qualifiers if stem or fold is 1.
-  if (stem == "0" && fold == "0") {
+  // the default stem, case and accentfold are set to 0 if this is being used, so we are only adding on qualifiers if stem,case,accent is 1.
+  if (stem == "0" && casefold == "0" && accentfold =="0") {
     return terms;
   }
@@ -537 +537 @@
   text_t::const_iterator here = terms.begin();
   text_t::const_iterator end = terms.end();
+
+  text_t word_modifier = "#";
+  if (stem == "1") word_modifier += "s";
+  if (casefold == "1") word_modifier += "i";
+  if (accentfold == "1") word_modifier += "f";
 
   while (here !=end) {
@@ -553 +558 @@
     }
     else {
-      word += "#";
-      if (stem == "1") word += "s";
-      if (fold == "1") word += "i";
-      outtext += word;
+      outtext += word+word_modifier;
       word.clear();
     }
@@ -571 +573 @@
   // get last word
   if (!word.empty()) {
-    word += "#";
-    if (stem == "1") word += "s";
-    if (fold == "1") word += "i";
-    word += " ";
-    outtext += word;
+   outtext += word+word_modifier+" ";
   }
   return outtext;
@@ -667 +665 @@
 
   text_tarray stems;
-  text_tarray folds;
+  text_tarray casefolds;
+  text_tarray accentfolds;
   if (argct == 1) {// mgpp - lucene doesn't do stem/case
-    text_t stem = args["fqs"];
-    if (stem.empty()) return; // somethings wrong
-    splitchar(stem.begin(), stem.end(), ',', stems);
-    
-    text_t fold = args["fqk"];
-    if (fold.empty()) return; // somethings wrong
-    splitchar(fold.begin(), fold.end(), ',', folds);
+    if (args["ss"]=="1") { //collection has stemming
+      text_t stem = args["fqs"];
+      if (stem.empty()) return; // somethings wrong
+      splitchar(stem.begin(), stem.end(), ',', stems);
+    }
+    if (args["ks"]=="1") { // collection has case folding
+      text_t fold = args["fqk"];
+      if (fold.empty()) return; // somethings wrong
+      splitchar(fold.begin(), fold.end(), ',', casefolds);
+    }
+    if (args["afs"]=="1") {
+      text_t accent = args["fqaf"];
+      if (accent.empty()) return; // somethings wrong
+      splitchar(accent.begin(), accent.end(), ',', accentfolds);
+    }
   }
   
@@ -696 +703 @@
       format_querystring(this_value, argb, segment); 
       if (argct == 1) { // mgpp only
-    this_value = addstemcase(this_value, stems[i], folds[i], argct);
+    this_value = addstemcase(this_value, ((args["ss"]=="1")?stems[i]:"0"), ((args["ks"]=="1")?casefolds[i]:"0"), ((args["afs"]=="1")?accentfolds[i]:"0"), argct);
       }
       // add tag info for this field (and other processing)