Changeset 24953 for main/trunk/greenstone2

Timestamp:

2012-01-18T20:57:09+13:00 (12 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:

• build-src/packages/Makefile (modified) (1 diff)
• collect/demo/etc/collect.cfg (modified) (1 diff)
• etc/main.cfg (modified) (2 diffs)
• etc/oai.cfg (modified) (3 diffs)
• gsicontrol.sh (modified) (2 diffs)

main/trunk/greenstone2/build-src/packages/Makefile

@@ -32 +32 @@
 PACKAGEDIRS = 
 
-USE_WVWARE=0
+USE_WVWARE=1
 ifeq ($(USE_WVWARE), 1)
 PACKAGEDIRS += wv/wv-gs 

main/trunk/greenstone2/collect/demo/etc/collect.cfg

@@ -15 +15 @@
 # following two plugins not needed for the demo collection, but are useful to
 # include for tutorial purposes
-plugin  ImagePlugin
-plugin  ZIPPlugin
+plugin  ImagePlugin
+plugin  ZIPPlugin
 plugin  MetadataXMLPlugin
 plugin  ArchivesInfPlugin

main/trunk/greenstone2/etc/main.cfg

@@ -23 +23 @@
 # Set status to "enabled" if you want the Maintenance and
 # Administration facility to be available.
-status      disabled
+status      enabled
 
 # Set collector to "enabled" if you want the "collector"
@@ -43 +43 @@
 # Set logcgiargs to "true" to keep a log of usage information in
 # $GSDLHOME/etc/usage.txt.
-logcgiargs      false
+logcgiargs      true
 
 # Set usecookies to "true" to use cookies to identify users (cookie 

main/trunk/greenstone2/etc/oai.cfg

@@ -42 +42 @@
 
 # The OAI repository name - human readable
-repositoryName ""
+repositoryName "Greenstone"
 
 # The OAI repository domain name or unique identifier - used for generating 
 # the document identifiers, which will be like:
 # oai:reposId:coll:oid
-repositoryId ""
+repositoryId "greenstone"
 
 # version is which oai id scheme is used for ids. Can be 1.1 or 2.0.
@@ -54 +54 @@
 
 # The central administrative email address for the repository.
-maintainer  ""
+maintainer  "[email protected]"
 
 # Which version of OAI the repository supports, 1.1 or 2.0
@@ -75 +75 @@
 # and this is followed by one or more collection names. The collection name 
 # is the name of the collection's folder in the collect directory.
-oaicollection demo documented-examples/oai-e 
+oaicollection cgibints
+#demo documented-examples/oai-e 
 
 # Optional, set name and description for each collection

main/trunk/greenstone2/gsicontrol.sh

@@ -105 +105 @@
     fi
     echo "Setting config file to use port $port";
+# Need to remove extra quotes around $collecthome. ${string//abc/xyz} does a replace all on abc with xyz
     cat "$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/conf/httpd.conf.in" \
     | sed "s@\*\*GSDL_OS_ARCH\*\*@$GSDLOS$GSDLARCH@g" \
@@ -111 +112 @@
     | sed "s@\*\*HOST_IP\*\*@$hostIP@g" \
     | sed "s@\*\*HOSTS\*\*@$hosts@g" \
-    | sed "s@\*\*COLLECTHOME\*\*@$collecthome@g" \
+    | sed "s@\*\*COLLECTHOME\*\*@${collecthome//\"/}@g" \
     | sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" \
     | sed "s@\*\*APACHE_HOME_OS\*\*@$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH@g" \