Changeset 22213

Show
Ignore:
Timestamp:
01.06.2010 15:11:40 (9 years ago)
Author:
kjdon
Message:

changes to methods of oaiconfig

Location:
main/trunk/greenstone2/runtime-src/src/oaiservr
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/oaiservr/identifyaction.cpp

    r20707 r22213  
    5858 
    5959  // Get the repository name (some human-readable name for the site, or superset of collections) 
    60   text_t repositoryName = this->configuration->getCollectionConfig("", "repositoryName"); 
     60  text_t repositoryName = this->configuration->getRepositoryName(); 
    6161  // Get admin's email address (i.e. the site maintainer) 
    62   text_t maintainer = this->configuration->getCollectionConfig("", "maintainer"); 
     62  text_t maintainer = this->configuration->getMaintainer(); 
    6363  text_t version = (this->configuration->getOAIVersion() <= 110) ? (text_t)"1.1":(text_t)"2.0"; 
    6464 
    65   text_t baseURL = this->configuration->getCollectionConfig("", "baseURL"); 
     65  text_t baseURL = this->configuration->getBaseURL(); 
    6666   
    6767  output << utf8convert << "  <repositoryName>"  << repositoryName << "</repositoryName>\n"; 
  • main/trunk/greenstone2/runtime-src/src/oaiservr/oaiaction.cpp

    r21978 r22213  
    212212  end  = params.end(); 
    213213   
    214   text_t baseURL = this->configuration->getCollectionConfig("", "baseURL"); 
     214  text_t baseURL = this->configuration->getBaseURL(); 
    215215 
    216216  int version = this->configuration->getOAIVersion(); 
     
    306306  } 
    307307  else {  
    308     text_t baseDocRoot = this->configuration->getCollectionConfig("", "baseDocRoot"); 
     308    text_t baseDocRoot = this->configuration->getBaseDocRoot(); 
    309309    output << "<?xml-stylesheet type=\"text/xsl\" href=\""<<baseDocRoot<<"/web/style/oai2.xsl\" ?>\n"; 
    310310    // output OAI v2.0 action header tag 
  • main/trunk/greenstone2/runtime-src/src/oaiservr/oaidispatcher.cpp

    r21980 r22213  
    6262    else {  
    6363      // output OAI v2.0 action header tag 
    64       text_t baseDocRoot = this->configuration->getCollectionConfig("", "baseDocRoot"); 
     64      text_t baseDocRoot = this->configuration->getBaseDocRoot(); 
    6565      output << "<?xml-stylesheet type=\"text/xsl\" href=\""<<baseDocRoot<<"/web/style/oai2.xsl\" ?>\n";    
    6666      output << "<OAI-PMH xmlns=\"http://www.openarchives.org/OAI/2.0/\"\n"