Changeset 27084 for main/trunk

Timestamp:

2013-03-14T12:46:15+13:00 (11 years ago)

Author:

kjdon

Message:

more tidying up of queryfilters. moved some stuff to the lucene class, and added 'virtual's so the right method actually gets used

Location:

main/trunk/greenstone2/runtime-src/src/colservr

Files:

• fieldedqueryfilter.h (modified) (2 diffs)
• lucenequeryfilter.cpp (modified) (1 diff)
• lucenequeryfilter.h (modified) (1 diff)
• queryfilter.cpp (modified) (3 diffs)
• queryfilter.h (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/colservr/fieldedqueryfilter.h

@@ -1 +1 @@
 /**********************************************************************
  *
- * queryfilter.h -- abstract base class for fielded queryfilters
+ * fieldedqueryfilter.h -- abstract base class for fielded queryfilters
  *         mgppqueryfilter and lucenequeryfilter 
  *          implement this
@@ -42 +42 @@
   bool full_text_browse (int filterRequestOptions);
 
-  // do query that might involve multiple sub queries
-  // textsearchptr and db_ptr are assumed to be valid
-  virtual void do_multi_query (const FilterRequest_t &request,
-               const vector<queryparamclass> &query_params,
-               queryresultsclass &multiresults,
-               comerror_t &err, ostream &logout)=0;
-
 public:
   fieldedqueryfilterclass ();
   virtual ~fieldedqueryfilterclass ();
 
-  void configure (const text_t &key, const text_tarray &cfgline);
-  bool init (ostream &logout);
-
-  void filter (const FilterRequest_t &request,
-           FilterResponse_t &response,
-           comerror_t &err, ostream &logout)=0;
-
-  void browsefilter(const FilterRequest_t &request,
-            FilterResponse_t &response,
-            comerror_t &err, ostream &logout);  
-
+  virtual void configure (const text_t &key, const text_tarray &cfgline);
+  virtual bool init (ostream &logout);
 
 };

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

@@ -109 +109 @@
 }
 
+bool lucenequeryfilterclass::set_queryparam_field(const OptionValue_t &option, queryparamclass &query) {
+
+  if (option.name == "FilterString") {
+    query.filterstring = option.value;
+    return true;
+  }
+  if (option.name == "SortField") {
+    query.sortfield = option.value;
+    return true;
+  }
+  if (option.name == "SortOrder") {
+    query.sortorder = (option.value == "descending");
+    return true;
+  }
+  if (option.name == "Fuzziness") {
+    query.fuzziness = option.value;
+    return true;
+  } 
+  return fieldedqueryfilterclass::set_queryparam_field(option, query);
+}
 
 void lucenequeryfilterclass::filter(const FilterRequest_t &request,

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

@@ -43 +43 @@
 
   void set_queryparam_defaults(queryparamclass &query );
+  bool set_queryparam_field(const OptionValue_t &option, queryparamclass &query);
 
 public:

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

@@ -264 +264 @@
 
 void queryfilterclass::set_queryparam_defaults(queryparamclass &query ) {
-  
+
   query.collection = collection;
   query.index = filterOptions["Index"].defaultValue;
@@ -281 +281 @@
 }
 
-bool queryfilterclass::set_queryparam_field(OptionValue_t option, queryparamclass &query) {
-
-if (option.name == "QueryType") {
-      query.search_type = (option.value == "ranked");
-    } else if (option.name == "MatchMode") {
-      query.match_mode = (option.value == "all");
-      if (query.match_mode == 1) query.maxdocs = -1;
-    } else if (option.name == "Term") {
-      query.querystring = option.value;
-    } else if (option.name == "Casefold") {
-      query.casefolding = (option.value == "true");
-    } else if (option.name == "Stem") {
-      query.stemming = (option.value == "true");
-    } else if (option.name == "AccentFold") {
-      query.accentfolding = (option.value == "true");
-    } else if (option.name == "Index"&& option.value !="") {
-      query.index = option.value;
-    } else if (option.name == "Subcollection") {
-      query.subcollection = option.value;
-    } else if (option.name == "Language") {
-      query.language = option.value;
-    } else if (option.name == "Maxdocs") {
-      query.maxdocs = option.value.getint();
-    // } else if (option.name == "PhraseMatch") {
-    //   phrasematch = option.value;
-    } else if (option.name == "Level") {
-      query.level = option.value;
-    } else if (option.name == "FilterString") {
-      query.filterstring = option.value;
-    } else if (option.name == "SortField") {
-      query.sortfield = option.value;
-    } else if (option.name == "SortOrder") {
-      query.sortorder = (option.value == "descending");
-    } else if (option.name == "Fuzziness") {
-      query.fuzziness = option.value;
- } 
+bool queryfilterclass::set_queryparam_field(const OptionValue_t &option, queryparamclass &query) {
+
+  if (option.name == "QueryType") {
+    query.search_type = (option.value == "ranked");
+    return true;
+  } 
+  if (option.name == "MatchMode") {
+    query.match_mode = (option.value == "all");
+    if (query.match_mode == 1) query.maxdocs = -1;
+    return true;
+  }
+  if (option.name == "Term") {
+    query.querystring = option.value;
+    return true;
+  }
+  if (option.name == "Casefold") {
+    query.casefolding = (option.value == "true");
+    return true;
+  }
+  if (option.name == "Stem") {
+    query.stemming = (option.value == "true");
+    return true;
+  }
+  if (option.name == "AccentFold") {
+    query.accentfolding = (option.value == "true");
+    return true;
+  }
+  if (option.name == "Index"&& option.value !="") {
+    query.index = option.value;
+    return true;
+  }
+  if (option.name == "Subcollection") {
+    query.subcollection = option.value;
+    return true;
+  }
+  if (option.name == "Language") {
+    query.language = option.value;
+    return true;
+  }
+  if (option.name == "Maxdocs") {
+    query.maxdocs = option.value.getint();
+    return true;
+  }
+  if (option.name == "Level") {
+    query.level = option.value;
+    return true;
+  }
+
+  return false;
 }
 // get the query parameters
@@ -324 +337 @@
                        ostream &logout) {
   outconvertclass text_t2ascii;
-
   // set defaults for the return parameters
   query_params.erase(query_params.begin(), query_params.end());

main/trunk/greenstone2/runtime-src/src/colservr/queryfilter.h

@@ -56 +56 @@
   int maxnumeric;
 
-  void set_queryparam_defaults(queryparamclass &query );
-  bool set_queryparam_field(OptionValue_t option, queryparamclass &query);
-  void parse_query_params (const FilterRequest_t &request,
+  virtual void set_queryparam_defaults(queryparamclass &query );
+  virtual bool set_queryparam_field(const OptionValue_t &option, queryparamclass &query);
+  virtual void parse_query_params (const FilterRequest_t &request,
                vector<queryparamclass> &query_params,
                int &startresults, int &endresults,