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

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

@@ -1 +1 @@
 /**********************************************************************
  *
- * queryfilter.cpp -- 
+ * mgppqueryfilter.cpp -- 
  * Copyright (C) 1999  The New Zealand Digital Library Project
  *
@@ -28 +28 @@
 #include "mgppsearch.h"
 
-/////////////////////////////////
-// functions for queryfilterclass
-/////////////////////////////////
-
-
 mgppqueryfilterclass::mgppqueryfilterclass () 
-  : queryfilterclass() {
-
-  
-  FilterOption_t filtopt;
-  
-  // -- onePerTerm  Level          enumerated
-  // likely to be Doc, Sec, Para, but we dont assume anything now
-  filtopt.clear();
-  filtopt.name = "Level";
-  filtopt.type = FilterOption_t::enumeratedt;
-  filtopt.repeatable = FilterOption_t::onePerTerm;
-  filtopt.defaultValue = "";
-  filterOptions["Level"] = filtopt;
-
-  // --  IndexField, enumerated, used to list available fields
-  filtopt.clear();
-  filtopt.name = "IndexField";
-  filtopt.type = FilterOption_t::enumeratedt;
-  filtopt.repeatable = FilterOption_t::onePerTerm;
-  filtopt.defaultValue = "";
-  filterOptions["IndexField"] = filtopt;
+  : fieldedqueryfilterclass() {
 
 }
@@ -62 +37 @@
 
 
-//whether a query is a full text browse
-bool mgppqueryfilterclass::full_text_browse (int filterRequestOptions) {
-  return (filterRequestOptions & FRfullTextBrowse);
-}
 
 void mgppqueryfilterclass::configure (const text_t &key, const text_tarray &cfgline) {
-  queryfilterclass::configure(key, cfgline);
-
-  if (key == "indexfieldmap") {
-    indexfieldmap.importmap (cfgline);
-    text_tarray options;
-    indexfieldmap.gettoarray (options);
-    filterOptions["IndexField"].validValues = options;
-    
-  } else if (key == "levelmap") {
-    levelmap.importmap (cfgline);
-  } else if (key == "indexlevels") {
-    filterOptions["Level"].validValues.erase(filterOptions["Level"].validValues.begin(), filterOptions["Level"].validValues.end());
-    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") {
-      ((mgppsearchclass *)textsearchptr)->set_text_level(cfgline[0]);
+  fieldedqueryfilterclass::configure(key, cfgline);
+
+  if (key == "textlevel") {
+    ((mgppsearchclass *)textsearchptr)->set_text_level(cfgline[0]);
   } else if (key == "indexstem") {
     ((mgppsearchclass *)textsearchptr)->set_indexstem (cfgline[0]);
-  } else if (key == "defaultindex") { // used for fields in mgpp
-    indexfieldmap.from2to (cfgline[0], filterOptions["IndexField"].defaultValue);
-  } else if (key == "defaultlevel") { 
-    levelmap.from2to (cfgline[0], filterOptions["Level"].defaultValue);
-  }
-  
-}
-
-bool mgppqueryfilterclass::init (ostream &logout) {
-  
-  if (!queryfilterclass::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];
-  }
-
-  return true;
+  }
 }
 
@@ -163 +88 @@
   // 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);  
  
    
@@ -261 +185 @@
   // 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();