Changeset 14286

Timestamp:

2007-07-31T11:03:58+12:00 (17 years ago)

Author:

oranfry

Message:

added xiao's last six changes to the 2.74 release branch

Location:

gsdl/branches/gsdl-2.74

Files:

• etc/error.txt (modified) (1 diff)
• etc/key.db (modified) ( previous)
• etc/oai.cfg (modified) (1 diff)
• etc/users.db (modified) ( previous)
• src/oaiservr/README.txt (modified) (1 diff)
• src/oaiservr/identityaction.cpp (modified) (1 diff)
• src/oaiservr/oaiaction.cpp (modified) (4 diffs)
• src/oaiservr/oaiconfig.cpp (modified) (2 diffs)
• src/oaiservr/oaiconfig.h (modified) (1 diff)

gsdl/branches/gsdl-2.74/etc/error.txt

@@ +1 @@
+Warning: couldn't read build.cfg file for collection "demo", gsdlhome="/research/oranfry/sandbox/gsdl-2.74"
+Warning: couldn't read build.cfg file for collection "demo", gsdlhome="/research/oranfry/sandbox/gsdl-2.74"

gsdl/branches/gsdl-2.74/etc/oai.cfg

@@ -24 +24 @@
 
 # Strings containing spaces should be enclosed in double quotes ""
+
+#the baseURL used by the oaiserver
+#Example: baseURL "http://your-domain-name/cgi-bin/oaiserver"
+baseURL "your-own-baseURL-goes-here"
 
 # The OAI repository name - human readable

gsdl/branches/gsdl-2.74/src/oaiservr/README.txt

@@ -44 +44 @@
   * maintainer
        One item only, as a valid email address
+  * baseURL
+       One item only, see the example in the oai.cfg file.
   * httpdomain 
        NB: in the gsdlsite.cfg file, NOT oai.cfg

gsdl/branches/gsdl-2.74/src/oaiservr/identityaction.cpp

@@ -26 +26 @@
   text_t version = (this->configuration->getOAIVersion() <= 110) ? (text_t)"1.1":(text_t)"2.0";
 
-  site_cfg_read(gsdlhome, httpdomain, httpprefix);
+  //site_cfg_read(gsdlhome, httpdomain, httpprefix);
+  text_t baseURL = this->configuration->getCollectionConfig("", "baseURL");
   
   output << "  <repositoryName>"  << repositoryName << "</repositoryName>" << endl;
-  output << "  <baseURL>"         << httpdomain     << "/oaimain</baseURL>" << endl; // Tack on the app name
+  output << "  <baseURL>"         << baseURL     << "</baseURL>" << endl; // Tack on the app name
   output << "  <adminEmail>"      << maintainer     << "</adminEmail>" << endl;
   output << "  <protocolVersion>" << version        << "</protocolVersion>" << endl;

gsdl/branches/gsdl-2.74/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;
   }

gsdl/branches/gsdl-2.74/src/oaiservr/oaiconfig.cpp

@@ -244 +244 @@
     }
   }
+  else if (key == "baseURL" && cfgline.size() >= 1) {
+    int line = 0;
+    
+    while (line < cfgline.size()) {
+      if (cfgline[line] != "NULL" &&
+      cfgline[line] != "") {
+    // do something
+    break;
+      }
+      else {
+    ++line;
+      }
+    }
+    
+    // Only try to set the configuration if we have a legitimate value ...
+    if (line < cfgline.size()) {
+      // ensure we have a map to write to
+      if (this->collectMap[this->collection] == NULL) {
+    this->collectMap[this->collection] = new oaicollectconfig(this->collection);
+      }
+      this->collectMap[this->collection]->baseURL = cfgline[line];
+    }
+  }
 }
 
@@ -260 +283 @@
   if (field == "repositoryName") {
     return this->collectMap[collection]->repositoryName;
+  }
+
+  if (field == "baseURL") {
+    return this->collectMap[collection]->baseURL;
   }
 

gsdl/branches/gsdl-2.74/src/oaiservr/oaiconfig.h

@@ -15 +15 @@
   text_t    maintainer;
   text_t    repositoryName;
+  text_t    baseURL;
   text_tmap fieldMap;    // maps from OAI name to GSDL name
 };