Changeset 865

Timestamp:

2000-01-25T11:58:00+13:00 (24 years ago)

Author:

sjboddie

Message:

fixed bug in cross-collection searching, tidied up a bit

Location:

trunk/gsdl/src/recpt

Files:

• queryaction.cpp (modified) (11 diffs)
• queryaction.h (modified) (2 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.33  2000/01/24 22:57:59  sjboddie
+   fixed bug in cross-collection searching, tidied up a bit
+
    Revision 1.32  1999/12/13 02:54:11  davidb
    Support for cross collection searching (CCS)
@@ -539 +542 @@
 }
 
-void queryaction::output_ccp (cgiargsclass &args, recptprotolistclass *protos,
-                  displayclass &disp, outconvertclass &outconvert,
-                  ostream &textout, ostream &logout) {
-
-  ColInfoResponse_t cinfo;
-  comerror_t err;
-  InfoFilterOptionsResponse_t fresponse;
-  InfoFilterOptionsRequest_t frequest;
-  frequest.filterName = "QueryFilter";
-
-  text_t &index = args["h"];
-  text_t &subcollection = args["j"];
-  text_t &language = args["n"];
-
-  text_tset collections;
-  text_t arg_c = args["c"];
-
-  // get collect info for 'c'
-  bool found_arg_c = false;
-  recptprotolistclass::iterator rprotolist_here = protos->begin();
-  const recptprotolistclass::iterator rprotolist_end = protos->end();  
-  while (rprotolist_here != rprotolist_end) 
-    {
-      if ((*rprotolist_here).p != NULL) 
-    {
-      (*rprotolist_here).p->get_collectinfo (arg_c, cinfo, err, logout);
-      if (err == noError && (cinfo.buildDate > 0)) 
-        {
-          text_tarray::iterator collist_here = cinfo.ccsCols.begin();
-          const text_tarray::iterator collist_end = cinfo.ccsCols.end();
-          while (collist_here != collist_end) {
-        collections.insert(*collist_here);
-        collist_here++;
-          }
-          found_arg_c = true;
-          break;
-        }
-        
-    }
-      rprotolist_here ++;
-    }
-
-  if (!found_arg_c)
-    {
-      // if no collection is found, let ccs be across all collections
-      rprotolist_here = protos->begin();
-      while (rprotolist_here != rprotolist_end) 
-    {
-      if ((*rprotolist_here).p != NULL) 
-        {
-          (*rprotolist_here).p->get_collectinfo (arg_c, cinfo, err, logout);
-          if (err == noError && (cinfo.buildDate > 0)) 
-
-        {
-          text_tarray collist;
-          (*rprotolist_here).p->get_collection_list (collist, err, logout);
-
-          text_tarray::iterator collist_here = collist.begin();
-          text_tarray::iterator collist_end = collist.end();
-          while (collist_here != collist_end) 
-            {
-              collections.insert(*collist_here);
-              collist_here++;
-            }       
-        }
-        }
-      rprotolist_here ++;
-    }
-    }
-
-  textout << outconvert << disp << "_query:header_\n"
-      << "<center>_navigationbar_</center><br>\n"
-      << "<form name=QueryForm method=get action=\"_gwcgi_\">\n"
-      << "<input type=hidden name=a value=\"q\">\n"
-      << "<input type=hidden name=e value=\"_compressedoptions_\">\n"
-      << "<input type=hidden name=ccp value=\"1\">\n"
-      << "<center><table width=_pagewidth_><tr valign=top>\n"
-      << "<td>Select collections to search for \"" << args["q"] 
-      << "\" <i>(index=" << index << " subcollection=" << subcollection
-      << " language=" << language << ")</i></td>\n"
-      << "<td><input type=\"submit\" value=\"_query:textbeginsearch_\"></td>\n"
-      << "</tr></table></center>\n"
-      << "<center><table width=_pagewidth_>\n"
-      << "<tr><td>\n";
-  
-  rprotolist_here = protos->begin();
-  while (rprotolist_here != rprotolist_end) {
-    if ((*rprotolist_here).p != NULL) {
-      
-      text_tarray collist;
-      (*rprotolist_here).p->get_collection_list (collist, err, logout);
-      if (err == noError) {
-    text_tarray::iterator collist_here = collist.begin();
-    text_tarray::iterator collist_end = collist.end();
-    while (collist_here != collist_end) {
-      
-      (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
-      if (err == noError && (cinfo.buildDate > 0)) {
-        
-        text_tset::const_iterator t = collections.find (*collist_here);
-        if (t == collections.end()) {collist_here++; continue;}
-
-        (*rprotolist_here).p->get_filteroptions (*collist_here, frequest, fresponse, err, logout);
-        if (err == noError) {
-          
-          FilterOption_tmap::const_iterator it;
-          FilterOption_tmap::const_iterator end = fresponse.filterOptions.end();
-          if (!index.empty()) {
-        it = fresponse.filterOptions.find ("Index");
-        if (it == end) {collist_here ++; continue;}
-        text_tarray::const_iterator there = (*it).second.validValues.begin();
-        text_tarray::const_iterator tend = (*it).second.validValues.end();
-        while (there != tend) {
-          if (*there == index) break;
-          there ++;
-        }
-        if (there == tend) {collist_here++; continue;}
-          }
-          if (!subcollection.empty()) {
-        it = fresponse.filterOptions.find ("Subcollection");
-        if (it == end) {collist_here++; continue;}
-        text_tarray::const_iterator there = (*it).second.validValues.begin();
-        text_tarray::const_iterator tend = (*it).second.validValues.end();
-        while (there != tend) {
-          if (*there == subcollection) break;
-          there ++;
-        }
-        if (there == tend) {collist_here++; continue;}
-          }
-          if (!language.empty()) {
-        it = fresponse.filterOptions.find ("Language");
-        if (it == end) {collist_here++; continue;}
-        text_tarray::const_iterator there = (*it).second.validValues.begin();
-        text_tarray::const_iterator tend = (*it).second.validValues.end();
-        while (there != tend) {
-          if (*there == language) break;
-          there ++;
-        }
-        if (there == tend) {collist_here++; continue;}
-          }
-        
-          // we've got a matching collection
-          textout << "<input type=checkbox";
-
-          text_tset::const_iterator t = collections.find (*collist_here);
-          if (t != collections.end()) textout << " checked"; // already know this is true
-
-          textout << outconvert 
-              << " name=cc value=\"" << *collist_here << "\">";
-          
-          if (!cinfo.collectionmeta["collectionname"].empty())
-        textout << outconvert << disp << cinfo.collectionmeta["collectionname"];
-          else 
-        textout << outconvert << *collist_here;
-          
-          textout << "<br>\n";
-          
-        }
-      }
-      collist_here ++;
-    }
-      }
-    }
-    rprotolist_here ++;
-  }
-  textout << outconvert << disp 
-      << "</td></tr></table></center>\n"
-      << "</form>\n"
-      << "_query:footer_\n";
-  
-}
-
 bool queryaction::do_action (cgiargsclass &args, recptprotolistclass *protos, 
                  browsermapclass *browsers, displayclass &disp, 
@@ -716 +547 @@
                  ostream &logout) {
   
-  if (args["ccs"] == 1) {
-    // cross collection searching (we'll just borrow the el argument
-    // from extlinkaction for now - this will probably want to use 
-    // a separate argument eventually)
-    //    if (args["ccp"] != 1 && args["el"] != "direct") {
-      // display the cross collection search page
-    //      output_ccp (args, protos, disp, outconvert, textout, logout);
-    //    } else {
+  if (args["ccs"] == "1") {
+    if (!args["cc"].empty()) {
       // 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 return true;
+      text_t::const_iterator b = args["cc"].begin();
+      text_t::const_iterator e = args["cc"].end();
+      if (findchar (b, e, ',') != e) {
+    if (!search_multiple_collections (args, protos, browsers, disp, outconvert,
+                      textout, logout)) return false;
+    return true;
+      } else {
+    if (!search_single_collection (args, args["cc"], protos, browsers, disp, 
+                       outconvert, textout, logout)) return false;
+    return true;
+      }
+    }
   }
 
   // simply query the current collection
-  if (!search_single_collection (args, protos, browsers, disp, outconvert,
-                 textout, logout)) return false;
-  
+  if (!search_single_collection (args, args["c"], protos, browsers, disp, 
+                 outconvert, textout, logout)) return false;
   return true;
 }
@@ -756 +585 @@
        << "set for doing multiple query - will search current collection\n";
     textout << outconvert << disp << "_query:textwarningnocollections_\n";
-    return search_single_collection (args, protos, browsers, disp, 
+    return search_single_collection (args, args["c"], protos, browsers, disp, 
                      outconvert, textout, logout);
   }
@@ -777 +606 @@
   int numdocs = 0;
   isapprox isApprox = Exact;
-  text_tset colnamedata;
-  colnamedata.insert ("collectionname");
 
   format_querystring (formattedstring, args.getintarg("b"));
@@ -797 +624 @@
   text_tarray::iterator col_end = collections.end();
 
+  map<text_t, int, lttext_t> termfreqs;
   while (col_here != col_end) {
 
@@ -845 +673 @@
     isApprox = response.isApprox;
 
-    text_t collectionname = *col_here;
-    FilterResponse_t nresponse;
-    if (get_info ("collection", *col_here, colnamedata, false, collectproto, nresponse, logout)) {
-      if (!nresponse.docInfo[0].metadata["collectionname"].values[0].empty())
-    collectionname = nresponse.docInfo[0].metadata["collectionname"].values[0];
-    }
-
     TermInfo_tarray::const_iterator this_term = response.termInfo.begin();
     TermInfo_tarray::const_iterator end_term = response.termInfo.end();
-    freqmsg += "<br><b>" + collectionname + "</b>: ";
     while (this_term != end_term) {
-      freqmsg += (*this_term).term + ": " + (*this_term).freq;
-      if ((this_term + 1) != end_term)
-    freqmsg += ", ";
+      termfreqs[(*this_term).term] += (*this_term).freq;
+      if ((col_here+1) == col_end) {
+    freqmsg += (*this_term).term + ": " + termfreqs[(*this_term).term];
+    if ((this_term+1) != end_term) freqmsg += ", ";
+      }
       this_term ++;
     }
@@ -961 +783 @@
 }
 
-bool queryaction::search_single_collection (cgiargsclass &args, recptprotolistclass *protos,
-                        browsermapclass *browsers, displayclass &disp,
-                        outconvertclass &outconvert, ostream &textout,
-                        ostream &logout) {
-
-  recptproto *collectproto = protos->getrecptproto (args["c"], logout);
+bool queryaction::search_single_collection (cgiargsclass &args, const text_t &collection,
+                        recptprotolistclass *protos, browsermapclass *browsers, 
+                        displayclass &disp, outconvertclass &outconvert, 
+                        ostream &textout, ostream &logout) {
+
+  recptproto *collectproto = protos->getrecptproto (collection, logout);
   if (collectproto == NULL) {
-    logout << outconvert << "queryaction::search_single_collection: " << args["c"]
+    logout << outconvert << "queryaction::search_single_collection: " << collection
        << " collection has a NULL collectproto\n";
     return false;
@@ -980 +802 @@
   ColInfoResponse_t cinfo;
   comerror_t err;
-  collectproto->get_collectinfo (args["c"], cinfo, err, logout);
+  collectproto->get_collectinfo (collection, cinfo, err, logout);
     
   browserclass *bptr = browsers->getbrowser (browsertype);
@@ -1003 +825 @@
   format_querystring (formattedstring, args.getintarg("b"));
   set_queryfilter_options (request, formattedstring, args);
-  collectproto->filter (args["c"], request, response, err, logout);
+  collectproto->filter (collection, request, response, err, logout);
   if (err != noError) {
     outconvertclass text_t2ascii;
     logout << text_t2ascii
        << "queryaction::search_single_collections: call to QueryFilter failed "
-       << "for " << args["c"] << " collection (" << get_comerror_string (err) << ")\n";
+       << "for " << collection << " collection (" << get_comerror_string (err) << ")\n";
     return false;
   }
@@ -1019 +841 @@
   // output the results
   bool use_table = is_table_content (formatlistptr);
-  bptr->output_section_group (response, args, "", 0, formatlistptr, 
+  bptr->output_section_group (response, args, collection, 0, formatlistptr, 
                   use_table, request.fields, request.getParents, 
                   collectproto, disp, outconvert, textout, logout);

trunk/gsdl/src/recpt/queryaction.h

@@ -70 +70 @@
              const FilterOption_t &option, displayclass &disp);
 
-  void output_ccp (cgiargsclass &args, recptprotolistclass *protos,
-           displayclass &disp, outconvertclass &outconvert,
-           ostream &textout, ostream &logout);
-  
-
   bool search_multiple_collections (cgiargsclass &args, recptprotolistclass *protos,
                     browsermapclass *browsers, displayclass &disp,
@@ -80 +75 @@
                     ostream &logout);
 
-  bool search_single_collection (cgiargsclass &args, recptprotolistclass *protos,
-                 browsermapclass *browsers, displayclass &disp,
-                 outconvertclass &outconvert, ostream &textout,
-                 ostream &logout);
+  bool search_single_collection (cgiargsclass &args, const text_t &collection,
+                 recptprotolistclass *protos, browsermapclass *browsers, 
+                 displayclass &disp, outconvertclass &outconvert, 
+                 ostream &textout, ostream &logout);