Changeset 828 for trunk

Timestamp:

1999-12-13T15:54:11+13:00 (24 years ago)

Author:

davidb

Message:

Support for cross collection searching (CCS)

File:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.32  1999/12/13 02:54:11  davidb
+   Support for cross collection searching (CCS)
+
    Revision 1.31  1999/12/05 21:22:33  sjboddie
    tidied up cross-collection searching a bit
@@ -551 +554 @@
 
   text_tset collections;
-  text_t arg_cc = args["cc"];
-  decode_cgi_arg (arg_cc);
-  splitchar (arg_cc.begin(), arg_cc.end(), ',', 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"
@@ -570 +624 @@
       << "<tr><td>\n";
   
-  recptprotolistclass::iterator rprotolist_here = protos->begin();
-  recptprotolistclass::iterator rprotolist_end = protos->end();
+  rprotolist_here = protos->begin();
   while (rprotolist_here != rprotolist_end) {
     if ((*rprotolist_here).p != NULL) {
@@ -583 +636 @@
       
       (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
-      //      if (err == noError && cinfo.isPublic && (cinfo.buildDate > 0)) {
       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) {
@@ -629 +684 @@
 
           text_tset::const_iterator t = collections.find (*collist_here);
-          if (t != collections.end()) textout << " checked";
+          if (t != collections.end()) textout << " checked"; // already know this is true
 
           textout << outconvert