Changeset 1695

Timestamp:

2000-11-23T17:16:56+13:00 (23 years ago)

Author:

nzdl

Message:

Fixed a bug in the cross-collection searching stuff

Location:

trunk/gsdl/src/recpt

Files:

• OIDtools.cpp (modified) (3 diffs)
• queryaction.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/OIDtools.cpp

@@ -25 +25 @@
 
 #include "OIDtools.h"
-
+#include <assert.h>
 
 // returns (in top) the top level of OID (i.e. everything
@@ -92 +92 @@
   request.docSet.push_back (OID);
   
+  assert (collectproto != NULL);
   collectproto->filter (collection, request, response, err, logout);
   if (err != noError) {
@@ -123 +124 @@
   request.fields = metadata;
   request.docSet.push_back (OID);
-  
+
+  assert (collectproto != NULL);
   collectproto->filter (collection, request, response, err, logout);
   if (err != noError) {

trunk/gsdl/src/recpt/queryaction.cpp

@@ -793 +793 @@
 
   ColInfoResponse_t *cinfo = NULL;
+  recptproto *collectproto = NULL;
   comerror_t err;
   FilterRequest_t request;
@@ -825 +826 @@
     request.getParents = false;
 
-    recptproto *collectproto = protos->getrecptproto (*col_here, logout);
+    collectproto = protos->getrecptproto (*col_here, logout);
     if (collectproto == NULL) {
       logout << outconvert << "queryaction::search_multiple_collections: " << *col_here 
@@ -926 +927 @@
   text_tset metadata; // empty !!
   bool getParents = false; // don't care !!
-  recptproto *collectproto = NULL;
   bool use_table;
   ResultDocInfo_t thisdoc;
@@ -967 +967 @@
     thisdoc = (*res_here).doc;
     use_table = is_table_content (formatlistptr);
+
+    collectproto = protos->getrecptproto ((*res_here).collection, logout);
+    if (collectproto == NULL) {
+      logout << outconvert << "queryaction::search_multiple_collections: " << (*res_here).collection
+         << " collection has a NULL collectproto, ignoring results\n";
+      res_here ++;
+      continue;
+    }
+
     browserptr->output_section_group (thisdoc, args, (*res_here).collection, 0, 
                           formatlistptr, use_table, metadata, getParents,