Changeset 18903 for gsdl/trunk/runtime-src/src/oaiservr/oaiconfig.cpp

Timestamp:

2009-04-08T10:47:40+12:00 (15 years ago)

Author:

kjdon

Message:

check the existence of collect.cfg to see if a collection name is valid or not, then don't advertise it if not.

File:

• gsdl/trunk/runtime-src/src/oaiservr/oaiconfig.cpp (modified) (2 diffs)

gsdl/trunk/runtime-src/src/oaiservr/oaiconfig.cpp

@@ -47 +47 @@
   // parameter, read in all the collection's individual configurations
   if (gsdlcollect == "") {
-    text_tarray::iterator here = this->collectList.begin();
-    text_tarray::iterator end  = this->collectList.end();
-    while (here != end) {       
-      this->configureCollection(gsdlhome, *here);
-      ++here;
-    }
+    text_tarray::iterator start = this->collectList.begin();
+    text_tarray::iterator here  = this->collectList.end()-1;
+    while (here != start) {     
+      if (!this->configureCollection(gsdlhome, *here)) {
+    this->collectList.erase(here);
+      }
+      --here;
+    }
+    // and do the first one
+    if (!this->configureCollection(gsdlhome, *here)) {
+      this->collectList.erase(here);
+    }
+    
   }
   else {
+    // what do we do if this fails?
     this->configureCollection(gsdlhome, gsdlcollect);
   }
@@ -81 +89 @@
 }
 
-void oaiconfig::configureCollection(const text_t &gsdlhome, const text_t &gsdlcollect)
+bool oaiconfig::configureCollection(const text_t &gsdlhome, const text_t &gsdlcollect)
 {
   text_t cnfgfile = filename_cat(gsdlhome, "collect", gsdlcollect, "etc", "collect.cfg");
+  if (!file_exists(cnfgfile)) {
+    return false;
+  }
   this->collection = gsdlcollect;
   this->read_configfile(cnfgfile);
-}
-
+
+  return true;
+}
 void oaiconfig::configure (const text_t &key, const text_tarray &cfgline)
 {