Changeset 800 for trunk

Timestamp:

1999-12-06T10:22:33+13:00 (24 years ago)

Author:

sjboddie

Message:

tidied up cross-collection searching a bit

File:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.31  1999/12/05 21:22:33  sjboddie
+   tidied up cross-collection searching a bit
+
    Revision 1.30  1999/11/08 20:26:37  sjboddie
    added multiplevalue option to cgiarginfo
@@ -438 +441 @@
   text_tarray phrases;
   get_phrases (args["q"], phrases);
+  num_phrases = phrases.size();
   text_tarray::const_iterator phere = phrases.begin();
   text_tarray::const_iterator pend = phrases.end();
@@ -661 +665 @@
     // from extlinkaction for now - this will probably want to use 
     // a separate argument eventually)
-    if (args["ccp"] != 1 && args["el"] != "direct") {
+    //    if (args["ccp"] != 1 && args["el"] != "direct") {
       // display the cross collection search page
-      output_ccp (args, protos, disp, outconvert, textout, logout);
-    } else {
+    //      output_ccp (args, protos, disp, outconvert, textout, logout);
+    //    } else {
       // query the selected collections
+
+    text_t::const_iterator b = args["cc"].begin();
+    text_t::const_iterator e = args["cc"].end();
+    if (!args["cc"].empty() && (findchar (b, e, ',') != e))
       if (!search_multiple_collections (args, protos, browsers, disp, outconvert,
                     textout, logout)) return false;
-    }
-  } else {
-    // simply query the current collection
-    if (!search_single_collection (args, protos, browsers, disp, outconvert,
-                   textout, logout)) return false;
-  }
-
+      else return true;
+  }
+
+  // simply query the current collection
+  if (!search_single_collection (args, protos, browsers, disp, outconvert,
+                 textout, logout)) return false;
+  
   return true;
 }
@@ -713 +721 @@
   text_t freqmsg = "_textfreqmsg1_";
   int numdocs = 0;
+  isapprox isApprox = Exact;
   text_tset colnamedata;
   colnamedata.insert ("collectionname");
@@ -775 +784 @@
     }
 
+    if (isApprox == Exact)
+      isApprox = response.isApprox;
+    else if (isApprox == MoreThan)
+      if (response.isApprox == Approximate)
+    isApprox = response.isApprox;
+
     text_t collectionname = *col_here;
     FilterResponse_t nresponse;
@@ -808 +823 @@
   }
 
-  if (numdocs > 0) disp.setmacro ("freqmsg", "query", freqmsg);
-  else disp.setmacro("resultline", "query", "_textnodocs_");
-
+  disp.setmacro ("freqmsg", "query", freqmsg);
+
+  text_t resline;
+  if (num_phrases > 0) isApprox = Exact;
+  if (isApprox == Approximate) resline = "_textapprox_";
+  else if (isApprox == MoreThan) resline = "_textmorethan_";
+  
+  if (numdocs == 0) resline = "_textnodocs_";
+  else if (numdocs == 1) resline += "_text1doc_";
+  else resline += text_t(numdocs) + " _textlotsdocs_";
+  disp.setmacro("resultline", "query", resline);
 
   QueryResult_tset::iterator res_here = results.begin();
@@ -982 +1005 @@
   // if there were phrases (post-processing) we're not going to include 
   // those documents that didn't match 
-  if (num_phrases > 0) {
-    numdocs = 0;
-    isApprox = Exact;
-    ResultDocInfo_tarray::const_iterator this_doc = response.docInfo.begin();
-    ResultDocInfo_tarray::const_iterator end_doc = response.docInfo.end();
-    while (this_doc != end_doc) {
-      if ((*this_doc).num_phrase_match == num_phrases) numdocs ++;
-      else break; // we can bail here as matching docs are sorted to top
-      this_doc++;
-    }
-  }
+  if (num_phrases > 0) isApprox = Exact;
 
   if (isApprox == Approximate) resline = "_textapprox_";