Changeset 334 for trunk/gsdl/src/colservr/mgsearch.cpp

Timestamp:

1999-07-01T21:29:21+12:00 (25 years ago)

Author:

rjmcnab

Message:

Changes for better reporting of number documents which match a query. Changes
should still work as before with older versions of mg.

File:

• trunk/gsdl/src/colservr/mgsearch.cpp (modified) (4 diffs)

trunk/gsdl/src/colservr/mgsearch.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.10  1999/07/01 09:29:19  rjmcnab
+   Changes for better reporting of number documents which match a query. Changes
+   should still work as before with older versions of mg.
+
    Revision 1.9  1999/07/01 03:54:48  rjmcnab
    Added code to plug in the equivalent terms of each of the query terms.
@@ -378 +382 @@
     setsearchmode (queryparams);
     submitquery (queryparams);
-    getresults (queryresults);
+    getresults (queryparams, queryresults);
     return true;
   }
@@ -445 +449 @@
 
 
-void mgsearchclass::getresults (queryresultsclass &queryresults)
-{
-  if (quotedquery[0] == '\0') 
-    { 
-      // don't need the text
-      mgq_results(result_docnums, 0, MAXNUMDOCS, 
-          ourquerycallback, (void *)(&queryresults));
-    }
-  else
-    {
-      // we need the text for this one
-      mgq_results(result_docs, 0, MAXNUMDOCS, 
-          ourquerycallback, (void *)(&queryresults));
-    }
+void mgsearchclass::getresults (const queryparamclass &queryparams,
+                queryresultsclass &queryresults) {
+  if (quotedquery[0] == '\0') { 
+    // don't need the text
+    mgq_results(result_docnums, 0, MAXNUMDOCS, 
+        ourquerycallback, (void *)(&queryresults));
+  } else {
+    // we need the text for this one
+    mgq_results(result_docs, 0, MAXNUMDOCS, 
+        ourquerycallback, (void *)(&queryresults));
+  }
   
   // get the term frequencies
@@ -468 +469 @@
   mgq_results(result_terms, 0, MAXNUMTERMS,
               termvariantscallback, (void *)(&queryresults));
+
+  // get the number of documents retrieved
+  int total_retrieved = 0, is_approx = 0;
+  mgq_docsretrieved (&total_retrieved, &is_approx);
+
+  if (total_retrieved == 0) {
+    // not available (or really was zero)
+    queryresults.docs_matched = queryresults.docs.size();
+    if (queryresults.docs_matched < queryparams.maxdocs)
+      queryresults.is_approx = true;
+    else
+      queryresults.is_approx = false;
+  } else {
+    queryresults.docs_matched = total_retrieved;
+    queryresults.is_approx = is_approx;
+  }
 }