Changeset 1717

Timestamp:

2000-11-29T16:58:07+13:00 (23 years ago)

Author:

nzdl

Message:

Fixed a couple of minor bugs in cross-collection searching

Location:

trunk/gsdl

Files:

• macros/pref.dm (modified) (1 diff)
• src/recpt/queryaction.cpp (modified) (1 diff)

trunk/gsdl/macros/pref.dm

@@ -61 +61 @@
   if (savedccs[collection] == 1) savedccs[collection] = 0;
   else savedccs[collection] = 1;
-        
+       
   var i;
   argcc = "";
+  var changed = 0;
   for (i in savedccs)
-    if (savedccs[i] == 1) argcc += "&cc=" + i;
+    if (savedccs[i] == 1) \{
+       argcc += "&cc=" + i;
+       changed = 1;
+    \}
+  if (changed == 1) argcc += "&r=1";
   updatehrefs();
 \}

trunk/gsdl/src/recpt/queryaction.cpp

@@ -1106 +1106 @@
   disp.setmacro ("freqmsg", "query", freqmsg);
 
-
   // set up _resultline_ macro
   text_t resline;
   int maxdocs = args.getintarg("m");
   int numdocs = response.numDocs;
-  if (maxdocs == -1) maxdocs = response.numDocs;
   isapprox isApprox = response.isApprox;
-
-  // if there were phrases (post-processing) we're not going to include 
-  // those documents that didn't match 
   if (num_phrases > 0) isApprox = Exact;
+  if (maxdocs == -1) maxdocs = numdocs;
+  else if (numdocs > maxdocs) {
+    numdocs = maxdocs;
+    isApprox = MoreThan;
+  }
 
   if (isApprox == Approximate) resline = "_textapprox_";