Changeset 24759

Timestamp:

2011-10-14T19:02:19+13:00 (13 years ago)

Author:

ak19

Message:

Fix for spaces in filepath when launching the apache webserver, since that calls gsicontrol with the reset-gsdlhome target, which needs to retrieve the gsdlhome property from the cgi-bin\gsdlhome. This property being a path value can contain spaces, so the delimiter separating the gsdlhome property key from its value cannot be (or contain) spaces. It's now been made a tab. Need to still test this on Linux.

Location:

main/trunk/greenstone2

Files:

• cgi-bin/gsdlsite.cfg.in (modified) (1 diff)
• gsicontrol.bat (modified) (1 diff)

main/trunk/greenstone2/cgi-bin/gsdlsite.cfg.in

@@ -5 +5 @@
 # points to the GSDLHOME directory
 # This must be set, and must point to the top level Greenstone directory
-# (usually gsdl or Greenstone)
-gsdlhome    **GSDLHOME**
+# (usually gsdl or Greenstone).
+# Put quotes around the GSDLHOME path value if it contains any spaces.
+# It's important that Tab(s) and not any spaces are used (as a delimiter)
+# to separate the gsdlhome property key from its value, since the value 
+# is a filepath and can therefore contain spaces of its own.
+gsdlhome    **GSDLHOME**
 
 # this is the http address of GSDLHOME

main/trunk/greenstone2/gsicontrol.bat

@@ -184 +184 @@
 if not exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" goto relocate
 
-FOR /F "tokens=2" %%G IN ('findstr /R ^gsdlhome "%GSDLHOME%\%cgibin%\gsdlsite.cfg"') do set gshome=%%G
+:: In gsdlsite.cfg, the tab char (and only the tab char) NEEDS to be the 
+:: delimiter between the gsdlhome property name and its value, the path. 
+:: The tab as delimiter is necessary just for that property line, since 
+:: the path can contain spaces and we therefore can't have space as delim.
+FOR /F "tokens=2 delims=    " %%G IN ('findstr /R ^gsdlhome "%GSDLHOME%\%cgibin%\gsdlsite.cfg"') do set gshome=%%G
 :: before string comparison, remove any quotes around gsdlhome value defined in config file
 if not [%gshome%] == [] set gshome=%gshome:"=%