Changeset 23233 for main/trunk/greenstone2/runtime-src/src/oaiservr/oaiconfig.cpp

Timestamp:

2010-10-27T14:41:49+13:00 (14 years ago)

Author:

kjdon

Message:

changed the url info stored in oai.cfg. Now have one optional field for web server url. Will be automatically generated if not specified. Then there are relative paths for oaiserver, library and doc root.

File:

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

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

@@ -293 +293 @@
     this->repositoryIdVersion = cfgline[0];
   }
-  else if (key == "baseURL") {
-    this->baseURL = cfgline[0];
-  } 
-  else if (key == "baseLibraryURL") {
-    this->baseLibraryURL = cfgline[0];
-  }
-  else if (key == "baseDocRoot") {
-    this->baseDocRoot = cfgline[0];
-  }
+  else if (key == "baseServerURL") {
+    this->baseServerURL = cfgline[0];
+  }
+  else if (key == "oaiserverPath") {
+    this->oaiserverPath = cfgline[0];
+  }
+  else if (key == "libraryPath") {
+    this->libraryPath = cfgline[0];
+  }
+  else if (key == "docRootPath") {
+    this->docRootPath = cfgline[0];
+  }
+
   else if (key == "oaiversion") {
     this->oaiVersion = cfgline[0];
   }
   
+}
+
+text_t oaiconfig::generateBaseServerURL() {
+  char *server_name = getenv("SERVER_NAME");
+  char *server_port = getenv("SERVER_PORT");
+  text_t url = "http://";
+  url.append(server_name);
+  url.append(":");
+  url.append(server_port);
+  return url;
 }
 
@@ -354 +368 @@
 text_t oaiconfig::getBaseURL()
 {
-  return this->baseURL;
+  if (this->baseServerURL.empty()) {
+    this->baseServerURL = generateBaseServerURL();
+  }
+  return this->baseServerURL + this->oaiserverPath;
 }
 text_t oaiconfig::getBaseLibraryURL()
 {
-  return this->baseLibraryURL;
+  if (this->baseServerURL.empty()) {
+    this->baseServerURL = generateBaseServerURL();
+  }
+  return this->baseServerURL + this->libraryPath;
 }
 text_t oaiconfig::getBaseDocRoot()
 {
-  return this->baseDocRoot;
+  if (this->baseServerURL.empty()) {
+    this->baseServerURL = generateBaseServerURL();
+  }
+  return this->baseServerURL + this->docRootPath;
+}
+
+text_t oaiconfig::getRelativeBaseDocRoot()
+{
+  return this->docRootPath;
 }
 text_t oaiconfig::getRepositoryName()