Changeset 27534 for main/trunk/greenstone2/runtime-src/src/oaiservr/listidsaction.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/listidsaction.cpp (modified) (1 diff)

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

@@ -210 +210 @@
 
     // 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