Changeset 27064 for main/trunk/greenstone2/runtime-src/src/colservr/mgqueryfilter.cpp

Timestamp:

2013-03-12T14:37:44+13:00 (11 years ago)

Author:

kjdon

Message:

adding reverse sort/sort order in for lucene search results sorting. reorganising code to avoid duplication, added fieldedqueryfilter in the chain of inheritance

File:

• main/trunk/greenstone2/runtime-src/src/colservr/mgqueryfilter.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/colservr/mgqueryfilter.cpp

@@ -285 +285 @@
 
   num_phrases = 0;
+
+  FilterOption_t filtopt;
+  // -- onePerQuery  PhraseMatch  enumerated
+  filtopt.name = "PhraseMatch";
+  filtopt.type = FilterOption_t::enumeratedt;
+  filtopt.repeatable = FilterOption_t::onePerQuery;
+  filtopt.defaultValue = "some_phrases";
+  filtopt.validValues.push_back ("all_phrases");
+  filtopt.validValues.push_back ("some_phrases");
+  filtopt.validValues.push_back ("all_docs");
+  filterOptions["PhraseMatch"] = filtopt;
+
 }
 
@@ -331 +343 @@
               endresults, phrasematch, logout);
   // do any mg specific diddling with query parameters that may be required
-  mg_parse_query_params (request, queryfilterparams, startresults, 
-             endresults, phrasematch, logout);
+  //  mg_parse_query_params (request, queryfilterparams, startresults, 
+  //             endresults, phrasematch, logout);
 
 
@@ -448 +460 @@
 }
 
-void mgqueryfilterclass::mg_parse_query_params (const FilterRequest_t &/*request*/,
+void mgqueryfilterclass::parse_query_params (const FilterRequest_t &request,
                         vector<queryparamclass> &query_params,
-                        int &/*startresults*/, int &/*endresults*/,
-                        text_t &/*phrasematch*/, ostream &/*logout*/) {
-
-  //  outconvertclass text_t2ascii;
+                        int &startresults, int &endresults,
+                        text_t &phrasematch, ostream &logout) {
+
+  queryfilterclass::parse_query_params (request, query_params, 
+                    startresults, endresults, logout);
+
+  phrasematch = filterOptions["PhraseMatch"].defaultValue;
+
+  // is there a better way to do this than iterate through all the options again??
+  OptionValue_tarray::const_iterator options_here = request.filterOptions.begin();
+  OptionValue_tarray::const_iterator options_end = request.filterOptions.end();
+  while (options_here != options_end) {
+    if ((*options_here).name == "PhraseMatch") {
+      phrasematch = (*options_here).value;
+      break;
+    }
+    ++options_here;
+  }
   
   vector<queryparamclass>::iterator query_here = query_params.begin();