Changeset 400 for trunk/gsdl/src/recpt/queryaction.cpp

Timestamp:

1999-07-16T20:33:36+12:00 (25 years ago)

Author:

rjmcnab

Message:

Changed the logic for getting the results string slightly

File:

• trunk/gsdl/src/recpt/queryaction.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.15  1999/07/16 08:33:36  rjmcnab
+   Changed the logic for getting the results string slightly
+
    Revision 1.14  1999/07/16 03:41:29  sjboddie
    changed isApprox
@@ -494 +497 @@
 void queryaction::define_query_macros (cgiargsclass &args, displayclass &disp, 
                        const FilterResponse_t &response) { 
-
-  int numdocs = response.numDocs;
-  int arg_m = args.getintarg("m");
-  if (numdocs > arg_m) numdocs = arg_m;
-
   // set up _freqmsg_ and _quotedquery_ macros
   text_t freqmsg = "_textfreqmsg1_";
@@ -516 +514 @@
   text_t resline;
   int maxdocs = args.getintarg("m");
+  int numdocs = response.numDocs;
+  if (response.isApprox == MoreThan && numdocs > maxdocs) numdocs = maxdocs;
 
   if (response.isApprox == Approximate) resline = "_textapprox_";
-  else if ((response.isApprox == MoreThan) || (response.numDocs > maxdocs)) 
-    resline = "_textmorethan_";
+  else if (response.isApprox == MoreThan) resline = "_textmorethan_";
+  
   if (numdocs == 0) resline = "_textnodocs_";
   else if (numdocs == 1) resline += "_text1doc_";
-  else 
-    if (response.numDocs > maxdocs)
-      resline += text_t(maxdocs) + " _textlotsdocs_";
-    else
-      resline += text_t(response.numDocs) + " _textlotsdocs_";
+  else resline += text_t(numdocs) + " _textlotsdocs_";
   
   disp.setmacro("resultline", "query", resline);