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

Timestamp:

2009-04-06T11:52:19+12:00 (15 years ago)

Author:

kjdon

Message:

some comments changed and support for oaimetadata in oai.cfg. list of sets stored in metadataSet

File:

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

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

@@ -155 +155 @@
     // first one.
     //
-    // This configuration should only appear in main.cfg
+    // This configuration should only appear in oai.cfg
     //
     if (this->collection != "") {
-      cerr << "Attempt to configure an oai collection outside of main.cfg" << endl;
+      cerr << "Attempt to configure an oai collection outside of oai.cfg" << endl;
       cerr << "Configuration attempted in " << this->collection << " collection." << endl;
       exit(1);
@@ -164 +164 @@
     for (int c = 0; c < cfgline.size(); ++c) {
       this->collectList.push_back(cfgline[c]);
+    }
+  }
+  else if (key == "oaimetadata" && cfgline.size() >= 1) {
+    // List of metadata prefixes to suuport
+    // This line should read:
+    //
+    // oaicollection <metadataname> <metadataname>...
+    //
+    //
+    // This configuration should only appear in oai.cfg
+    //
+    if (this->collection != "") {
+      cerr << "Attempt to configure oai metadata outside of oai.cfg" << endl;
+      cerr << "Configuration attempted in " << this->collection << " collection." << endl;
+      exit(1);
+    }
+    for (int c = 0; c < cfgline.size(); ++c) {
+      // todo: check that the set name is valid
+      this->metadataSet.insert(cfgline[c]);
     }
   }
@@ -172 +191 @@
     // oaiinfo <information field name> <value>
     //
-    // This configuration should only be attempted in main.cfg
+    // This configuration should only be attempted in oai.cfg
     //
     if (this->collection != "") {
-      cerr << "Attempt to set oai information outside of main.cfg" << endl;
+      cerr << "Attempt to set oai information outside of oai.cfg" << endl;
       cerr << "Configuration attempted in " << this->collection << " collection." << endl;
       exit(1);