Changeset 1688

Timestamp:

2000-11-22T14:49:44+13:00 (23 years ago)

Author:

kjm18

Message:

Added actualNumDocs variable to QueryResult - records the total number of
docs found by the query (before pruning to the size of maxdocs)

Location:

trunk/gsdl/src/mgpp/text

Files:

• MGQuery.cpp (modified) (3 diffs)
• Terms.cpp (modified) (6 diffs)
• Terms.h (modified) (1 diff)

trunk/gsdl/src/mgpp/text/MGQuery.cpp

@@ -635 +635 @@
   if (resultsSize == 0 || resultsSize > result.docs.size())
     resultsSize = result.docs.size();
-  
+
+  result.actualNumDocs = result.docs.size(); // the total number of docs 
+                                   //returned, before pruning based on maxDocs
+
   // sort results by rank if needed
   GTRank gtRank;
@@ -681 +684 @@
     result.ranks.erase(result.ranks.begin()+resultsSize, result.ranks.end());
   }
+
+  // remove extra docs that are unwanted
   result.docs.erase(result.docs.begin()+resultsSize, result.docs.end());
 }
@@ -704 +709 @@
   realresult.ranks = result.ranks;
   realresult.termFreqs = result.termFreqs;
+  realresult.actualNumDocs = result.actualNumDocs;
 
   if (queryInfo.docLevel == level || level.empty()) {

trunk/gsdl/src/mgpp/text/Terms.cpp

@@ -67 +67 @@
   ranks.erase (ranks.begin(), ranks.end());
   termFreqs.erase (termFreqs.begin(), termFreqs.end());
+  actualNumDocs = 0;
 }
 
@@ -88 +89 @@
   for (i=0; i<r.termFreqs.size(); i++)
     s << r.termFreqs[i] << ", ";
+
+  s << "\nactual number of docs found: " << r.actualNumDocs;
   s << "\n\n";
 
@@ -97 +100 @@
   return ((r1.docs == r2.docs) &&
       (r1.ranks == r2.ranks) &&
-      (r1.termFreqs == r2.termFreqs));
+      (r1.termFreqs == r2.termFreqs) &&
+      (r1.actualNumDocs == r2.actualNumDocs));
 }
 
@@ -107 +111 @@
   ranks.erase (ranks.begin(), ranks.end());
   termFreqs.erase (termFreqs.begin(), termFreqs.end());
+  actualNumDocs = 0;
 }
 
@@ -131 +136 @@
   for (i=0; i<r.termFreqs.size(); i++)
     s << r.termFreqs[i] << ", ";
+  s << "\nactual number of docs found: " << r.actualNumDocs;
   s << "\n\n";
 
@@ -141 +147 @@
       (r1.levels == r2.levels) &&
       (r1.ranks == r2.ranks) &&
-      (r1.termFreqs == r2.termFreqs));
+      (r1.termFreqs == r2.termFreqs) &&
+      (r1.actualNumDocs == r2.actualNumDocs));
 }
 

trunk/gsdl/src/mgpp/text/Terms.h

@@ -81 +81 @@
   
   TermFreqArray termFreqs;
-  
+
+  unsigned long actualNumDocs;
   void Clear ();
   QueryResult ();