Changeset 27534 for main/trunk/greenstone2/runtime-src/src/oaiservr/listrecsaction.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/listrecsaction.cpp (modified) (2 diffs)

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

@@ -165 +165 @@
     text_t set = params["set"];
 
+    // Is the set a super collection??
+    text_tarray &super_collections = this->configuration->getSuperCollectionsList();
+    bool super_collection_found = false;
+    for (int c = 0; c < super_collections.size(); c++)
+    {
+      if (super_collections[c] == set)
+      {
+    super_collection_found = true;
+    break;
+      }
+    }
+    if (super_collection_found) {
+      this->errorType = "";
+      return true;
+    }
+
     // Extract the collection name from the set specification
     text_t collection = "";
@@ -180 +196 @@
     
     // Check the collection is one that is in the list in the oai.cfg file
-    text_tarray &collections = this->configuration->getCollectionsList();
-    bool collection_found = false;
-    for (int c = 0; c < collections.size(); c++)
-    {
-      if (collections[c] == collection)
-      {
-    collection_found = true;
-    break;
-      }
-    }
-
-    // The collection was not found
-    if (!collection_found)
-    {
-      this->errorType = "badArgument";
-      return false;
-    }
+    if (!this->configuration->isValidCollection(collection)) {
+      this->errorType = "badArgument";
+      return false;
+    }      
 
     // Check the child set if it was given