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

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

@@ -110 +110 @@
   }
   return 200; 
+}
+
+bool oaiconfig::isValidCollection(const text_t &collection)
+{
+  for (int c = 0; c < this->collectList.size(); c++)
+    if (this->collectList[c] == collection) {
+      return true;
+    }
+  return false;
 }
 
@@ -208 +217 @@
     for (int c = 0; c < cfgline.size(); ++c) {
       this->collectList.push_back(cfgline[c]);
+      addToAllCollectionsList(cfgline[c]);
     }
   }
   else if (key == "oaisupercollection" && cfgline.size() > 1) {
 
-    // Configure a hierarchical super set
+    // Configure a super collection set
     // The line should read 
     //
@@ -240 +250 @@
       }
       this->collectMap[sub_coll]->superCollectList.push_back(super_set);
+      addToAllCollectionsList(sub_coll);
     }
   }
@@ -358 +369 @@
   }
 }
-
+  
+void oaiconfig::addToAllCollectionsList(const text_t coll_name) {
+
+  for (int c=0; c<this->allCollectList.size(); c++) {
+    if (allCollectList[c] == coll_name) return;
+  }
+  this->allCollectList.push_back(coll_name);
+  
+}
 
 text_t oaiconfig::generateBaseServerURL() {
@@ -481 +500 @@
 }
 
-text_tarray oaiconfig::getSuperCollectionsForThisCollection(const text_t &collection) {
+
+text_tarray oaiconfig::getSuperCollectionsForThisCollection(const text_t &collection)
+{
 
   text_tarray super_colls;