Changeset 27534 for main/trunk/greenstone2/runtime-src/src/oaiservr/abstractlistaction.cpp

Timestamp:

2013-06-04T15:56:26+12:00 (11 years ago)

Author:

kjdon

Message:

more changes for super collection stuff. Now can handle having collections in a super colleciton that are not in the main collection list

File:

• main/trunk/greenstone2/runtime-src/src/oaiservr/abstractlistaction.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/oaiservr/abstractlistaction.cpp

@@ -84 +84 @@
   }
 
-  // Case for no "set" argument present -- output all records in all collections
-  // or we are a super collection
+  // Case for no "set" argument present - output all records in all collections & super colls
+  // Case for super collection set - output all records in all collections in this super coll
   else
   {
@@ -94 +94 @@
       collections = this->configuration->getSuperCollectionCollections(set_name);
     } else {
-      collections = this->configuration->getCollectionsList();
+      
+      collections = this->configuration->getAllCollectionsList();//this->configuration->getCollectionsList();
+    
     }
     if (collections.size() == 0)
@@ -121 +123 @@
     {
       // If output_content_for_set() returns false a resumption token has been output, so it's time to stop
-      if (output_content_for_set(output, protocol, params, *collection_iterator, "", "") == false)
+      if (output_content_for_set(output, protocol, params, *collection_iterator, "", set_name) == false)
       {
     return true;