Changeset 1690

Timestamp:

2000-11-22T16:23:32+13:00 (23 years ago)

Author:

nzdl

Message:

Tidied up the "n documents matched the query" string that's produced
when searching mulitple collections

File:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -902 +902 @@
   disp.setmacro ("freqmsg", "query", freqmsg);
 
+  int maxdocs = args.getintarg("m");
+  int firstdoc = args.getintarg("r");
+  int hitsperpage = args.getintarg("o");
+  if (num_phrases > 0) isApprox = Exact;
+  if (maxdocs == -1) maxdocs = numdocs;
+  else if (numdocs > maxdocs) {
+    numdocs = maxdocs;
+    isApprox = MoreThan;
+  }
+  if (hitsperpage == -1) hitsperpage = numdocs;
+
   text_t resline;
-  if (num_phrases > 0) isApprox = Exact;
   if (isApprox == Approximate) resline = "_textapprox_";
   else if (isApprox == MoreThan) resline = "_textmorethan_";
@@ -921 +931 @@
   format_t *formatlistptr = NULL;
   browserclass *browserptr = NULL;
-
-  int maxdocs = args.getintarg("m");
-  int firstdoc = args.getintarg("r");
-  int hitsperpage = args.getintarg("o");
-  if (maxdocs == -1) maxdocs = numdocs;
-  else if (numdocs > maxdocs) numdocs = maxdocs;
-  if (hitsperpage == -1) hitsperpage = numdocs;
 
   // set up _thisfirst_ and _thislast_ macros