Changeset 22213 for main/trunk/greenstone2/runtime-src

Timestamp:

2010-06-01T15:11:40+12:00 (14 years ago)

Author:

kjdon

Message:

changes to methods of oaiconfig

Location:

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

Files:

• identifyaction.cpp (modified) (1 diff)
• oaiaction.cpp (modified) (2 diffs)
• oaidispatcher.cpp (modified) (1 diff)

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

@@ -58 +58 @@
 
   // Get the repository name (some human-readable name for the site, or superset of collections)
-  text_t repositoryName = this->configuration->getCollectionConfig("", "repositoryName");
+  text_t repositoryName = this->configuration->getRepositoryName();
   // Get admin's email address (i.e. the site maintainer)
-  text_t maintainer = this->configuration->getCollectionConfig("", "maintainer");
+  text_t maintainer = this->configuration->getMaintainer();
   text_t version = (this->configuration->getOAIVersion() <= 110) ? (text_t)"1.1":(text_t)"2.0";
 
-  text_t baseURL = this->configuration->getCollectionConfig("", "baseURL");
+  text_t baseURL = this->configuration->getBaseURL();
   
   output << utf8convert << "  <repositoryName>"  << repositoryName << "</repositoryName>\n";

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

@@ -212 +212 @@
   end  = params.end();
   
-  text_t baseURL = this->configuration->getCollectionConfig("", "baseURL");
+  text_t baseURL = this->configuration->getBaseURL();
 
   int version = this->configuration->getOAIVersion();
@@ -306 +306 @@
   }
   else { 
-    text_t baseDocRoot = this->configuration->getCollectionConfig("", "baseDocRoot");
+    text_t baseDocRoot = this->configuration->getBaseDocRoot();
     output << "<?xml-stylesheet type=\"text/xsl\" href=\""<<baseDocRoot<<"/web/style/oai2.xsl\" ?>\n";
     // output OAI v2.0 action header tag

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

@@ -62 +62 @@
     else { 
       // output OAI v2.0 action header tag
-      text_t baseDocRoot = this->configuration->getCollectionConfig("", "baseDocRoot");
+      text_t baseDocRoot = this->configuration->getBaseDocRoot();
       output << "<?xml-stylesheet type=\"text/xsl\" href=\""<<baseDocRoot<<"/web/style/oai2.xsl\" ?>\n";   
       output << "<OAI-PMH xmlns=\"http://www.openarchives.org/OAI/2.0/\"\n"