Changeset 608 for trunk/gsdl

Timestamp:

1999-09-21T23:34:42+12:00 (25 years ago)

Author:

sjboddie

Message:

added Maxdocs queryfilter option which may be -1 for 'all'

Location:

trunk/gsdl/src/recpt

Files:

• queryaction.cpp (modified) (4 diffs)
• querytools.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.23  1999/09/21 11:34:42  sjboddie
+   added Maxdocs queryfilter option which may be -1 for 'all'
+
    Revision 1.22  1999/09/07 23:08:51  rjmcnab
    removed some compiler warnings
@@ -309 +312 @@
   // check m argument
   int arg_m = args.getintarg("m");
-  if (arg_m < 0) {
-    logout << "Warning: \"m\" argument less than 0 (" << arg_m << ")\n";
+  if (arg_m < -1) {
+    logout << "Warning: \"m\" argument less than -1 (" << arg_m << ")\n";
     cgiarginfo *minfo = argsinfo.getarginfo ("m");
     if (minfo != NULL) args["m"] = minfo->argdefault;
@@ -579 +582 @@
   int maxdocs = args.getintarg("m");
   int numdocs = response.numDocs;
+  if (maxdocs == -1) maxdocs = response.numDocs;
   isapprox isApprox = response.isApprox;
 
@@ -595 +599 @@
   }
 
-  //  if (isApprox == MoreThan && numdocs > maxdocs) numdocs = maxdocs;
-  if (numdocs > maxdocs) {numdocs = maxdocs; isApprox = MoreThan;}
-
   if (isApprox == Approximate) resline = "_textapprox_";
   else if (isApprox == MoreThan) resline = "_textmorethan_";

trunk/gsdl/src/recpt/querytools.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.7  1999/09/21 11:32:42  sjboddie
+   added Maxdocs queryfilter option which may be -1 for 'all'
+
    Revision 1.6  1999/09/07 04:56:58  sjboddie
    added GPL notice
@@ -146 +149 @@
     }
   }
+
+  int arg_m = args.getintarg("m");
+
+  option.name = "Maxdocs";
+  option.value = arg_m;
+  request.filterOptions.push_back (option);
   
   option.name = "StartResults";
@@ -152 +161 @@
 
   option.name = "EndResults";
-  int arg_m = args.getintarg("m");
   int endresults = args.getintarg("o") + (args.getintarg("r") - 1);
-  if (endresults > arg_m) endresults = arg_m;
+  if ((endresults > arg_m) && (arg_m != -1)) endresults = arg_m;
   option.value = endresults;
   request.filterOptions.push_back (option);