Changeset 1324 for trunk/gsdl/src/colservr/queryfilter.h

Timestamp:

2000-08-02T12:58:29+12:00 (24 years ago)

Author:

kjm18

Message:

mgpp incorporated. the old mgsearchclass and queryfilterclass are changed.
Have a base searchclass, from which mgsearchclass and mgppsearchclass inherit.
Have a base queryfilterclass, from which mgqueryfilterclass and
mgppqueryfilterclass inherit. librarymain in recpt should choose the appropriate
type (mg vs mgpp) for each collection.

File:

• trunk/gsdl/src/colservr/queryfilter.h (modified) (5 diffs)

trunk/gsdl/src/colservr/queryfilter.h

@@ -1 +1 @@
 /**********************************************************************
  *
- * queryfilter.h -- 
+ * queryfilter.h -- abstract base class for queryfilters
+ *          mgqueryfilter and mgppqueryfilter implement this
  * Copyright (C) 1999  The New Zealand Digital Library Project
  *
@@ -35 +36 @@
 #include "infodbclass.h"
 #include "maptools.h"
-#include "mgsearch.h"
+#include "search.h"
 #include "queryinfo.h"
-
-
-// resultsorderer_t is used to sort the query results
-struct resultsorderer_t {
-  bool compare_phrase_match;
-  bool compare_terms_match;
-  bool compare_doc_weight;
-  docresultmap *docset;
-
-  resultsorderer_t();
-  void clear();
-  bool operator()(const int &t1, const int &t2) const;
-};
-
 
 
@@ -63 +50 @@
   gdbmclass *gdbmptr;
   
-  mgsearchclass *mgsearchptr;
+  searchclass *mgsearchptr;
   
-  int num_phrases;
-
-  void get_phrase_terms (const text_t &querystring, 
-             const termfreqclassarray &orgterms,
-             vector<termfreqclassarray> &phrases);
-
-  // do aditional query processing
-  virtual void post_process (const queryparamclass &queryparams,
-                 queryresultsclass &queryresults);
-
-  // get the query parameters
+   // get the query parameters
   void parse_query_params (const FilterRequest_t &request,
                vector<queryparamclass> &query_params,
@@ -83 +60 @@
   // do query that might involve multiple sub queries
   // mgsearchptr and gdbmptr are assumed to be valid
-  void do_multi_query (const FilterRequest_t &request,
+  virtual void do_multi_query (const FilterRequest_t &request,
                const vector<queryparamclass> &query_params,
                queryresultsclass &multiresults,
-               comerror_t &err, ostream &logout);
+               comerror_t &err, ostream &logout)=0;
 
-  virtual void sort_doc_results (const FilterRequest_t &request,
-                 docresultsclass &docs);
-
-  
 public:
   queryfilterclass ();
@@ -100 +73 @@
 
   // the mgsearchptr remains the responsability of the calling code
-  void set_mgsearchptr (mgsearchclass *themgsearchptr) {mgsearchptr=themgsearchptr;}
+  void set_mgsearchptr (searchclass *themgsearchptr) {mgsearchptr=themgsearchptr;}
 
-  void configure (const text_t &key, const text_tarray &cfgline);
+  virtual void configure (const text_t &key, const text_tarray &cfgline);
   bool init (ostream &logout);
+
   text_t get_filter_name () {return "QueryFilter";}
-  void filter (const FilterRequest_t &request,
+  bool translate(gdbmclass *gdbmptr, int docnum, text_t &trans_OID);
+  bool need_matching_docs (int filterResultOptions);
+  bool need_term_info (int filterResultOptions);
+
+
+  virtual void filter (const FilterRequest_t &request,
            FilterResponse_t &response,
-           comerror_t &err, ostream &logout);
+           comerror_t &err, ostream &logout)=0;
+
+
+
 };
 
 
 #endif
+