Changeset 14282

Timestamp:

2007-07-31T10:41:04+12:00 (17 years ago)

Author:

xiao

Message:

modify to read the baseURL from oai.cfg using getCollectionConfig() instead of using site_cfg_read() from gsdlsite.cfg.

File:

• gsdl/trunk/src/oaiservr/oaiaction.cpp (modified) (4 diffs)

gsdl/trunk/src/oaiservr/oaiaction.cpp

@@ -216 +216 @@
   
   // Read stuff from the gsdlsite.cfg file. We do this to get the base URL (httpdomain)
-  site_cfg_read(gsdlhome, httpdomain, httpprefix); 
+  //site_cfg_read(gsdlhome, httpdomain, httpprefix); 
+  text_t baseURL = this->configuration->getCollectionConfig("", "baseURL");
 
   int version = this->configuration->getOAIVersion();
@@ -225 +226 @@
      * <requestURL>http://baseURL.com/oaimain?verb="someVerb"&amp;key=value</requestURL>
      */
-    requestURL = "  <requestURL>" + httpdomain + "/oaimain";
+    requestURL = "  <requestURL>" + baseURL;
     
     if(numArgs == 0) break; // If no args, all done - the error will be picked up later 
@@ -251 +252 @@
      */
     if(numArgs == 0) {
-      requestURL = "  <request>" + httpdomain + "/oaimain</request>\n";
+      requestURL = "  <request>" + baseURL + "</request>\n";
       break;
     }
@@ -260 +261 @@
       ++here;
     }
-    requestURL += ">\n           " + httpdomain + "/oaimain</request>\n";
+    requestURL += ">\n           " + baseURL + "</request>\n";
     break;
   }