Changeset 22284 for main/trunk/greenstone2/runtime-src/src/oaiservr

Timestamp:

2010-06-23T13:49:55+12:00 (14 years ago)

Author:

kjdon

Message:

new toOID takes an extra arg, repos_id, so its generates ids like oai:repos-id:collname:doc-id. old version is still used for set spec ids which remain like demo:CL5. another method to extrac the collection name from a full id

Location:

main/trunk/greenstone2/runtime-src/src/oaiservr

Files:

• oaiconfig.cpp (modified) (3 diffs)
• oaiconfig.h (modified) (1 diff)

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

@@ -261 +261 @@
     this->repositoryName = cfgline[0];
   }
+  else if (key == "repositoryId") {
+    this->repositoryId = cfgline[0];
+  }
+  else if (key == "repositoryIdVersion") {
+    this->repositoryIdVersion = cfgline[0];
+  }
   else if (key == "baseURL") {
     this->baseURL = cfgline[0];
@@ -270 +276 @@
     this->baseDocRoot = cfgline[0];
   }
+  else if (key == "oaiversion") {
+    this->oaiVersion = cfgline[0];
+  }
   
 }
@@ -334 +343 @@
   return this->repositoryName;
 }
+text_t oaiconfig::getRepositoryId()
+{
+  return this->repositoryId;
+}
+text_t oaiconfig::getRepositoryIdVersion()
+{
+  return this->repositoryIdVersion;
+}
 text_t oaiconfig::getMaintainer()
 {

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

@@ -36 +36 @@
   text_t getBaseDocRoot();
   text_t getRepositoryName();
+  text_t getRepositoryId();
+  text_t getRepositoryIdVersion();
   text_t getMaintainer();
  private:
   bool configureCollection(const text_t &gsdlhome, const text_t &collection);
   
-  text_t    repositoryName;
+  text_t    repositoryName; // human readable name
+  text_t repositoryId; // unique (among oai servers) domain name or id for the repository
+  text_t repositoryIdVersion; // 1.1 or 2.0 for identifier scheme
   text_t    baseURL; // URL of oaiserver.cgi
   text_t    baseLibraryURL; // URL of library.cgi (used for urls to greenstone documents )