Changeset 27084 for main/trunk/greenstone2/runtime-src/src/colservr/fieldedqueryfilter.h

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

File:

• main/trunk/greenstone2/runtime-src/src/colservr/fieldedqueryfilter.h (modified) (2 diffs)

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);
 
 };