Changeset 15403

Show
Ignore:
Timestamp:
13.05.2008 12:26:57 (11 years ago)
Author:
mdewsnip
Message:

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

Location:
gsdl/trunk/src/oaiservr
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/src/oaiservr/Makefile.in

    r13773 r15403  
    100100    ../../src/recpt/nullproto.o ../../src/recpt/recptproto.o \ 
    101101    ../../src/recpt/htmlutils.o ../../src/recpt/infodbclass.o \ 
    102     ../../src/recpt/recptconfig.o ../../src/recpt/cgiargs.o \ 
    103     ../../src/recpt/cgiutils.o 
     102    ../../src/recpt/cgiargs.o ../../src/recpt/cgiutils.o 
    104103 
    105104COMMONOBJECTS = oaiargs.o oaiaction.o oaiconfig.o oaidispatcher.o \ 
  • gsdl/trunk/src/oaiservr/identityaction.cpp

    r15198 r15403  
    11#include "identityaction.h" 
    2 #include "recptconfig.h" 
    32 
    43bool identityaction::validateAction(recptproto *protocol, oaiargs &params) 
     
    3029bool identityaction::output_content(ostream &output, recptproto *protocol, oaiargs &params) 
    3130{ 
    32   text_t gsdlhome, httpdomain, httpprefix; 
    33    
    3431  // Get the repository name (some human-readable name for the site, or superset of collections) 
    3532  text_t repositoryName = this->configuration->getCollectionConfig("", "repositoryName"); 
    3633  // Get admin's email address (i.e. the site maintainer) 
    3734  text_t maintainer = this->configuration->getCollectionConfig("", "maintainer"); 
    38   // Get baseURL by extracting httpdomain from the gsdlsite.cfg file 
    3935  text_t version = (this->configuration->getOAIVersion() <= 110) ? (text_t)"1.1":(text_t)"2.0"; 
    4036 
    41   //site_cfg_read(gsdlhome, httpdomain, httpprefix); 
    4237  text_t baseURL = this->configuration->getCollectionConfig("", "baseURL"); 
    4338   
  • gsdl/trunk/src/oaiservr/oaiaction.cpp

    r15196 r15403  
    22#include "oaitools.h" 
    33#include "OIDtools.h" 
    4 #include "recptconfig.h" 
    54 
    65#include <string> 
     
    210209  text_tmap::const_iterator end; 
    211210  int numArgs = params.getSize(); 
    212   text_t gsdlhome, httpdomain, httpprefix; 
    213211 
    214212  here = params.begin(); 
    215213  end  = params.end(); 
    216214   
    217   // Read stuff from the gsdlsite.cfg file. We do this to get the base URL (httpdomain) 
    218   //site_cfg_read(gsdlhome, httpdomain, httpprefix);  
    219215  text_t baseURL = this->configuration->getCollectionConfig("", "baseURL"); 
    220216 
  • gsdl/trunk/src/oaiservr/win32.mak

    r13773 r15403  
    115115 
    116116RECPTOBJECTS = "$(recptDir)\comtypes.obj" "$(recptDir)\OIDtools.obj" "$(recptDir)\nullproto.obj" "$(recptDir)\recptproto.obj" \ 
    117                "$(recptDir)\htmlutils.obj" "$(recptDir)\infodbclass.obj" "$(recptDir)\recptconfig.obj" "$(recptDir)\cgiargs.obj" \ 
     117               "$(recptDir)\htmlutils.obj" "$(recptDir)\infodbclass.obj" "$(recptDir)\cgiargs.obj" \ 
    118118               "$(recptDir)\cgiutils.obj" 
    119119