Changeset 15403

Timestamp:

2008-05-13T12:26:57+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Untangling colservr/recpt) Removed some unused references to recptconfig.

Location:

gsdl/trunk/src/oaiservr

Files:

• Makefile.in (modified) (1 diff)
• identityaction.cpp (modified) (2 diffs)
• oaiaction.cpp (modified) (2 diffs)
• win32.mak (modified) (1 diff)

gsdl/trunk/src/oaiservr/Makefile.in

@@ -100 +100 @@
     ../../src/recpt/nullproto.o ../../src/recpt/recptproto.o \
     ../../src/recpt/htmlutils.o ../../src/recpt/infodbclass.o \
-    ../../src/recpt/recptconfig.o ../../src/recpt/cgiargs.o \
-    ../../src/recpt/cgiutils.o
+    ../../src/recpt/cgiargs.o ../../src/recpt/cgiutils.o
 
 COMMONOBJECTS = oaiargs.o oaiaction.o oaiconfig.o oaidispatcher.o \

gsdl/trunk/src/oaiservr/identityaction.cpp

@@ -1 +1 @@
 #include "identityaction.h"
-#include "recptconfig.h"
 
 bool identityaction::validateAction(recptproto *protocol, oaiargs &params)
@@ -30 +29 @@
 bool identityaction::output_content(ostream &output, recptproto *protocol, oaiargs &params)
 {
-  text_t gsdlhome, httpdomain, httpprefix;
-  
   // Get the repository name (some human-readable name for the site, or superset of collections)
   text_t repositoryName = this->configuration->getCollectionConfig("", "repositoryName");
   // Get admin's email address (i.e. the site maintainer)
   text_t maintainer = this->configuration->getCollectionConfig("", "maintainer");
-  // Get baseURL by extracting httpdomain from the gsdlsite.cfg file
   text_t version = (this->configuration->getOAIVersion() <= 110) ? (text_t)"1.1":(text_t)"2.0";
 
-  //site_cfg_read(gsdlhome, httpdomain, httpprefix);
   text_t baseURL = this->configuration->getCollectionConfig("", "baseURL");
   

gsdl/trunk/src/oaiservr/oaiaction.cpp

@@ -2 +2 @@
 #include "oaitools.h"
 #include "OIDtools.h"
-#include "recptconfig.h"
 
 #include <string>
@@ -210 +209 @@
   text_tmap::const_iterator end;
   int numArgs = params.getSize();
-  text_t gsdlhome, httpdomain, httpprefix;
 
   here = params.begin();
   end  = params.end();
   
-  // Read stuff from the gsdlsite.cfg file. We do this to get the base URL (httpdomain)
-  //site_cfg_read(gsdlhome, httpdomain, httpprefix); 
   text_t baseURL = this->configuration->getCollectionConfig("", "baseURL");
 

gsdl/trunk/src/oaiservr/win32.mak

@@ -115 +115 @@
 
 RECPTOBJECTS = "$(recptDir)\comtypes.obj" "$(recptDir)\OIDtools.obj" "$(recptDir)\nullproto.obj" "$(recptDir)\recptproto.obj" \
-               "$(recptDir)\htmlutils.obj" "$(recptDir)\infodbclass.obj" "$(recptDir)\recptconfig.obj" "$(recptDir)\cgiargs.obj" \
+               "$(recptDir)\htmlutils.obj" "$(recptDir)\infodbclass.obj" "$(recptDir)\cgiargs.obj" \
                "$(recptDir)\cgiutils.obj"