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

Timestamp:

2013-06-04T11:05:08+12:00 (11 years ago)

Author:

kjdon

Message:

implemented oaisupercollection. add to oai.cfg and the server will make a new set containing the specified collections

File:

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

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

@@ -55 +55 @@
     position = resumption_token.getPosition();
   }
-
-  // Case for "set" argument present -- output just the records in the specified set
+  
+  // is it a super collection??
+  bool is_super_collection = false;
+  
   if (set_name != "")
   {
+    text_tarray super_colls = this->configuration->getSuperCollectionsList();
+    for (int s = 0; s<super_colls.size(); s++) {
+      if (set_name == super_colls[s]) {
+    is_super_collection = true;
+    break;
+      }
+    }
+  }
+      
+  // Case for "set" argument present that is not a super collection -- output just the records in the specified set
+  if (set_name != "" && !is_super_collection) {
     // Separate the collection name and Greenstone classifier OID from the set name
     text_t collection_name = "";
@@ -72 +85 @@
 
   // Case for no "set" argument present -- output all records in all collections
+  // or we are a super collection
   else
   {
     // Get a list of the collections available
-    text_tarray& collections = this->configuration->getCollectionsList();
+    text_tarray collections;
+
+    if (is_super_collection) {
+      collections = this->configuration->getSuperCollectionCollections(set_name);
+    } else {
+      collections = this->configuration->getCollectionsList();
+    }
     if (collections.size() == 0)
     {
@@ -120 +140 @@
   return true;
 }
-
 
 bool abstractlistaction::output_content_for_set(ostream &output, recptproto *protocol, oaiargs &params, text_t collection_name, text_t gsdl_classifier_OID, text_t set_name)