Changeset 27064 for main/trunk/greenstone2/runtime-src/src/colservr/lucenequeryfilter.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/lucenequeryfilter.cpp (modified) (5 diffs)

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

@@ -28 +28 @@
 #include "lucenesearch.h"
 
-/////////////////////////////////
-// functions for queryfilterclass
-/////////////////////////////////
-
-
 lucenequeryfilterclass::lucenequeryfilterclass () 
-  : queryfilterclass() {
+  : fieldedqueryfilterclass() {
 
   
   FilterOption_t filtopt;
   
-  // -- onePerTerm  Level          enumerated
-  // likely to be Doc, Sec, Para, but we dont assume anything now
+  // -- onePerQuery SortField, enumerated, used to list available sorting fields
   filtopt.clear();
-  filtopt.name = "Level";
+  filtopt.name = "SortField";
   filtopt.type = FilterOption_t::enumeratedt;
-  filtopt.repeatable = FilterOption_t::onePerTerm;
+  filtopt.repeatable = FilterOption_t::onePerQuery;
   filtopt.defaultValue = "";
-  filterOptions["Level"] = filtopt;
-
-  // --  IndexField, enumerated, used to list available fields
+  filterOptions["SortField"] = filtopt;
+
+  // -- onePerQuery SortOder      enumerated (0=ascending, 1=descending)
   filtopt.clear();
-  filtopt.name = "IndexField";
+  filtopt.name = "SortOrder";
   filtopt.type = FilterOption_t::enumeratedt;
-  filtopt.repeatable = FilterOption_t::onePerTerm;
+  filtopt.repeatable = FilterOption_t::onePerQuery;
+  filtopt.defaultValue = "ascending";
+  filtopt.validValues.push_back("ascending");
+  filtopt.validValues.push_back("descending");
+  filterOptions["SortOrder"] = filtopt;
+
+  // -- onePerQuery Fuzziness string 0.0-1.0
+  filtopt.clear();
+  filtopt.name = "Fuzziness";
+  filtopt.type = FilterOption_t::stringt;
+  filtopt.repeatable = FilterOption_t::onePerQuery;
   filtopt.defaultValue = "";
-  filterOptions["IndexField"] = filtopt;
-
+  filterOptions["Fuzziness"] = filtopt;
+
+ // -- onePerQuery FilterString  string
+  filtopt.clear();
+  filtopt.name = "FilterString";
+  filtopt.type = FilterOption_t::stringt;
+  filtopt.repeatable = FilterOption_t::onePerQuery;
+  filtopt.defaultValue = "";
+  filterOptions["FilterString"] = filtopt;
 }
 
@@ -62 +73 @@
 
 
-//whether a query is a full text browse
-bool lucenequeryfilterclass::full_text_browse (int filterRequestOptions) {
-  return (filterRequestOptions & FRfullTextBrowse);
-}
 
 void lucenequeryfilterclass::configure (const text_t &key, const text_tarray &cfgline) {
-  queryfilterclass::configure(key, cfgline);
-
-  if (key == "indexfieldmap") {
-    indexfieldmap.importmap (cfgline);
-    
-    // update the list of indexes in the filter information
-    text_tarray options;
-    indexfieldmap.gettoarray (options);
-    filterOptions["IndexField"].validValues = options;
-  } else if (key == "levelmap") {
-    levelmap.importmap (cfgline);
-  } else if (key == "indexlevels") {
-    text_tarray::const_iterator here = cfgline.begin();
-    text_tarray::const_iterator end = cfgline.end();
-    while (here != end) {
-      if (!(*here).empty()) {
-    filterOptions["Level"].validValues.push_back(*here);
-      }
-      ++here;
-    }
-  } else if (key == "textlevel") {
-      ((lucenesearchclass *)textsearchptr)->set_text_level(cfgline[0]);
-  } else if (key == "defaultindex") { 
-    indexfieldmap.from2to (cfgline[0], filterOptions["IndexField"].defaultValue);
-  } else if (key == "defaultlevel") { 
-    levelmap.from2to (cfgline[0], filterOptions["Level"].defaultValue);
-  }
-  
+  fieldedqueryfilterclass::configure(key, cfgline);
+
+  if (key == "textlevel") {
+    ((lucenesearchclass *)textsearchptr)->set_text_level(cfgline[0]);
+  }
 }
 
 bool lucenequeryfilterclass::init (ostream &logout) {
   
-  if (!queryfilterclass::init(logout)) {
+  if (!fieldedqueryfilterclass::init(logout)) {
     return false;
   }
   
-  if (filterOptions["IndexField"].defaultValue.empty()) {
-    // use first index in map as default if no default is set explicitly
-    text_tarray fromarray;
-    indexfieldmap.getfromarray(fromarray);
-    if (fromarray.size()) {
-      filterOptions["IndexField"].defaultValue = fromarray[0];
-    }
-  }
-  if (filterOptions["Levels"].defaultValue.empty()) {
-    // use first level as default if no default is set explicitly
-    if (!filterOptions["Level"].validValues[0].empty())
-      filterOptions["Levels"].defaultValue = filterOptions["Level"].validValues[0];
-  }
-
+  text_tarray field_array;
+  indexfieldmap.gettoarray(field_array);
+  for (int i=0; i<field_array.size(); i++) {
+    text_t field = field_array[i];
+    if (field!="ZZ" && field !="ZZ") {
+      filterOptions["SortField"].validValues.push_back("by"+field);
+    }
+  }
   return true;
 }
+
+void lucenequeryfilterclass::set_queryparam_defaults(queryparamclass &query ) {
+
+  fieldedqueryfilterclass::set_queryparam_defaults(query);
+  query.filterstring = filterOptions["FilterString"].defaultValue;  
+  query.sortfield = filterOptions["SortField"].defaultValue;
+  query.sortorder = (filterOptions["SortOrder"].defaultValue == "descending");
+  query.fuzziness = filterOptions["Fuzziness"].defaultValue;  
+
+}
+
 
 void lucenequeryfilterclass::filter(const FilterRequest_t &request,
@@ -160 +149 @@
   // get the query parameters
   int startresults, endresults;
-  text_t phrasematch; // not used here any more
   vector<queryparamclass> queryfilterparams;
   parse_query_params (request, queryfilterparams, startresults, 
-              endresults, phrasematch, logout);  
+              endresults, logout);  
  
    
@@ -258 +246 @@
   // get the query parameters
   int startresults, endresults;
-  text_t phrasematch; // not used here any more, just have it so can use
-                      // parse_query_params function
   
   vector<queryparamclass> queryfilterparams;
   parse_query_params (request, queryfilterparams, startresults, 
-              endresults, phrasematch, logout);  
+              endresults, logout);  
 
   vector<queryparamclass>::const_iterator query_here = queryfilterparams.begin();
@@ -392 +378 @@
 
 
-