Changeset 24953

Show
Ignore:
Timestamp:
18.01.2012 20:57:09 (7 years ago)
Author:
ak19
Message:

For non-standard collecthome specified in gsdlsite.cfg on linux, need to remove any extraneous quotes around collecthome before writing it into the apache httpd.conf file.

Location:
main/trunk/greenstone2
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/build-src/packages/Makefile

    r24815 r24953  
    3232PACKAGEDIRS =  
    3333 
    34 USE_WVWARE=0 
     34USE_WVWARE=1 
    3535ifeq ($(USE_WVWARE), 1) 
    3636PACKAGEDIRS += wv/wv-gs  
  • main/trunk/greenstone2/collect/demo/etc/collect.cfg

    r24298 r24953  
    1515# following two plugins not needed for the demo collection, but are useful to 
    1616# include for tutorial purposes 
    17 plugin  ImagePlugin 
    18 plugin  ZIPPlugin 
     17plugin  ImagePlugin 
     18plugin  ZIPPlugin 
    1919plugin  MetadataXMLPlugin 
    2020plugin  ArchivesInfPlugin 
  • main/trunk/greenstone2/etc/main.cfg

    r24518 r24953  
    2323# Set status to "enabled" if you want the Maintenance and 
    2424# Administration facility to be available. 
    25 status      disabled 
     25status      enabled 
    2626 
    2727# Set collector to "enabled" if you want the "collector" 
     
    4343# Set logcgiargs to "true" to keep a log of usage information in 
    4444# $GSDLHOME/etc/usage.txt. 
    45 logcgiargs      false 
     45logcgiargs      true 
    4646 
    4747# Set usecookies to "true" to use cookies to identify users (cookie  
  • main/trunk/greenstone2/etc/oai.cfg

    r24517 r24953  
    4242 
    4343# The OAI repository name - human readable 
    44 repositoryName "" 
     44repositoryName "Greenstone" 
    4545 
    4646# The OAI repository domain name or unique identifier - used for generating  
    4747# the document identifiers, which will be like: 
    4848# oai:reposId:coll:oid 
    49 repositoryId "" 
     49repositoryId "greenstone" 
    5050 
    5151# version is which oai id scheme is used for ids. Can be 1.1 or 2.0. 
     
    5454 
    5555# The central administrative email address for the repository. 
    56 maintainer  "" 
     56maintainer  "anupama@waikato.ac.nz" 
    5757 
    5858# Which version of OAI the repository supports, 1.1 or 2.0 
     
    7575# and this is followed by one or more collection names. The collection name  
    7676# is the name of the collection's folder in the collect directory. 
    77 oaicollection demo documented-examples/oai-e  
     77oaicollection cgibints 
     78#demo documented-examples/oai-e  
    7879 
    7980# Optional, set name and description for each collection 
  • main/trunk/greenstone2/gsicontrol.sh

    r24901 r24953  
    105105    fi 
    106106    echo "Setting config file to use port $port"; 
     107# Need to remove extra quotes around $collecthome. ${string//abc/xyz} does a replace all on abc with xyz 
    107108    cat "$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/conf/httpd.conf.in" \ 
    108109    | sed "s@\*\*GSDL_OS_ARCH\*\*@$GSDLOS$GSDLARCH@g" \ 
     
    111112    | sed "s@\*\*HOST_IP\*\*@$hostIP@g" \ 
    112113    | sed "s@\*\*HOSTS\*\*@$hosts@g" \ 
    113     | sed "s@\*\*COLLECTHOME\*\*@$collecthome@g" \ 
     114    | sed "s@\*\*COLLECTHOME\*\*@${collecthome//\"/}@g" \ 
    114115    | sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" \ 
    115116    | sed "s@\*\*APACHE_HOME_OS\*\*@$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH@g" \