Changeset 311 for trunk/gsdl/src

Timestamp:

1999-06-30T10:06:23+12:00 (25 years ago)

Author:

rjmcnab

Message:

Added a couple of fields to queryinfo to handle a special version
of mg.

Location:

trunk/gsdl/src/colservr

Files:

• queryfilter.cpp (modified) (2 diffs)
• queryinfo.cpp (modified) (3 diffs)
• queryinfo.h (modified) (2 diffs)

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/06/29 22:06:23  rjmcnab
+   Added a couple of fields to queryinfo to handle a special version
+   of mg.
+
    Revision 1.5  1999/06/27 22:08:48  sjboddie
    now check for defaultindex, defaultsubcollection, and defaultlanguage
@@ -325 +329 @@
         resultdoc.OID = trans_OID;
         resultdoc.ranking = (int)((*docs_here).docweight * 10000.0 + 0.5);
+
+        // these next two are not available on all versions of mg
+        resultdoc.num_terms_matched = (*docs_here).num_query_terms_matched; 
+        resultdoc.query_phrase_match = (*docs_here).query_phrase_match;
+        
         response.docInfo.push_back (resultdoc);
       }

trunk/gsdl/src/colservr/queryinfo.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/06/29 22:06:23  rjmcnab
+   Added a couple of fields to queryinfo to handle a special version
+   of mg.
+
    Revision 1.2  1999/01/12 01:51:02  rjmcnab
+
    Standard header.
 
@@ -142 +147 @@
 void queryresultsclass::clear ()
 {
+  docs_matched_set = false;;
+  docs_matched = 0;
+  is_approx = false;
+  
   docs.erase(docs.begin(),docs.end());
   terms.erase(terms.begin(),terms.end());
@@ -148 +157 @@
 queryresultsclass &queryresultsclass::operator=(const queryresultsclass &q)
 {
+  docs_matched_set = q.docs_matched_set;
+  docs_matched = q.docs_matched;
+  is_approx = q.is_approx;
+  
   docs = q.docs;
   terms = q.terms;
+  termvariants = q.termvariants;
 
   return *this;

trunk/gsdl/src/colservr/queryinfo.h

@@ -80 +80 @@
 // one query result
 
-class docresultclass
-{
+class docresultclass {
 public:
-  docresultclass(void) {docnum=-1;docweight=0.0;};
+  docresultclass(void) {
+    docnum=-1; docweight=0.0; num_query_terms_matched=0;
+    query_phrase_match=false;
+  };
   ~docresultclass(void) {};
-
+  
   int docnum;
   float docweight;
+  int num_query_terms_matched;  // not available on all versions of mg
+  bool query_phrase_match;      // not available on all versions of mg
 };
 
@@ -97 +101 @@
 // query results
 
-class queryresultsclass 
-{
+class queryresultsclass {
 public:
+  queryresultsclass () {clear();}
+
+  bool docs_matched_set;
+  int docs_matched; // not available on all versions of mg
+  bool is_approx;   // not available on all versions of mg
+  
   vector<docresultclass> docs;
   vector<termfreqclass> terms;
   text_tarray termvariants;
-
+  
   void clear ();
   queryresultsclass &operator=(const queryresultsclass &q);
-
-  int getnumdocs () {return docs.size();}
+  
+  int getnumdocs () {
+    if (docs_matched_set) return docs_matched;
+    else return docs.size();
+  }
   int getnumterms () {return terms.size();}
-
+  
   void sortqueryterms();
   void uniqqueryterms();