Changeset 398 for trunk/gsdl/src/recpt

Timestamp:

1999-07-16T15:42:23+12:00 (25 years ago)

Author:

sjboddie

Message:

changed isApprox

Location:

trunk/gsdl/src/recpt

Files:

• comtypes.cpp (modified) (2 diffs)
• comtypes.h (modified) (2 diffs)
• queryaction.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/comtypes.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.14  1999/07/16 03:41:29  sjboddie
+   changed isApprox
+
    Revision 1.13  1999/07/08 20:46:45  rjmcnab
    Added the result number to the ResultDocInfo_t
@@ -202 +205 @@
 void FilterResponse_t::clear () {
   numDocs = 0;
-  isApprox = false;
+  isApprox = Exact;
   termInfo.erase (termInfo.begin(), termInfo.end());
   docInfo.erase (docInfo.begin(), docInfo.end());

trunk/gsdl/src/recpt/comtypes.h

@@ -278 +278 @@
 // FilterResponse ::= SEQUENCE {
 //   numDocs   [0] IMPLICIT INTEGER,
-//   isApprox  [1] IMPLICIT BOOLEAN,                  -- whether numDocs is approximate
-//   termInfo  [2] IMPLICIT SEQUENCE OF TermInfo,     -- empty if not required
-//   docInfo   [3] IMPLICIT SEQUENCE OF ResultDocInfo -- empty if not required
-// }
+//   isApprox  [1] ENUMERATED {Exact(0), Approximate(1), MoreThan(2)}, -- whether numDocs is approximate
+//   termInfo  [2] IMPLICIT SEQUENCE OF TermInfo,                      -- empty if not required
+//   docInfo   [3] IMPLICIT SEQUENCE OF ResultDocInfo                  -- empty if not required
+// }
+
+enum isapprox {Exact=0, Approximate=1, MoreThan=2};
+
 struct FilterResponse_t {
   void clear ();
@@ -287 +290 @@
 
   int numDocs;
-  bool isApprox; // some versions of mg might be more 'approximate' than others :-)
+  isapprox isApprox;
   TermInfo_tarray termInfo; // empty if not requested
   ResultDocInfo_tarray docInfo; // empty if not requested

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.14  1999/07/16 03:41:29  sjboddie
+   changed isApprox
+
    Revision 1.13  1999/07/16 00:19:01  sjboddie
    some changes to the way quoted queries are handled
@@ -512 +515 @@
   // set up _resultline_ macro
   text_t resline;
-
-  // can't use isApprox here as it will be false as long 
-  // as numDocs < MAXDOCS (currently 500). If arg_m is less
-  // than MAXDOCS numDocs can be greater than arg_m while
-  // isApprox is false.
-  if (response.isApprox) resline = "_textapprox_";
+  int maxdocs = args.getintarg("m");
+
+  if (response.isApprox == Approximate) resline = "_textapprox_";
+  else if ((response.isApprox == MoreThan) || (response.numDocs > maxdocs)) 
+    resline = "_textmorethan_";
   if (numdocs == 0) resline = "_textnodocs_";
   else if (numdocs == 1) resline += "_text1doc_";
-  else resline += text_t(response.numDocs) + " _textlotsdocs_";
-
+  else 
+    if (response.numDocs > maxdocs)
+      resline += text_t(maxdocs) + " _textlotsdocs_";
+    else
+      resline += text_t(response.numDocs) + " _textlotsdocs_";
+  
   disp.setmacro("resultline", "query", resline);