Changeset 24765 for main/trunk/greenstone2

Timestamp:

2011-10-17T22:52:27+13:00 (13 years ago)

Author:

ak19

Message:

Undoing previous commit to gsdlsite.cfg.in and gsicontrol.bat where a tab separated gsdlhome property key from its value, so that spaces in the filepath could be preserved on Windows. The new method first puts back gsicontrol.bat to how it used to read the gsdlhome property line and parse it differently in order to get the gsdlhome value correctly if there are spaces in it.

Location:

main/trunk/greenstone2

Files:

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

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).
-# 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**
+# (usually gsdl or Greenstone)
+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
 
-:: 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
+set gshome=
+FOR /F "tokens=*" %%G IN ('findstr /R ^gsdlhome "%GSDLHOME%\%cgibin%\gsdlsite.cfg"') do (call :concat %%G)
+
+:: The following doesn't work if there are spaces in the gsdlhome filepath
+::FOR /F "tokens=2" %%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:"=%
+:: if not [%gshome%] == [] set gshome=%gshome:"=%
+
 if "%gshome%" == "%GSDLHOME%" set gshome=& goto exit
   
@@ -207 +208 @@
 ::for %%G in (gs2-server.app gli.app client-gli.app gems.app) do if exist "%%G\Contents\document.wflow" del "%%G\Contents\document.wflow"
 goto cfgweb
+
+:: Subroutine used to glue parts of a filepath that contains spaces back together again
+:: http://www.computing.net/answers/programming/batch-for-loop-tokens/16727.html
+:concat
+:: first remove any quotes around this part of the filepath
+set suffix=%~1
+if not "%suffix%" == "gsdlhome" set gshome=%gshome%%suffix%
+shift
+if not "%~1"=="" goto concat
+goto :eof
 
 
@@ -292 +303 @@
 if "%safepath%" == "" for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed% s@\\@\/@g"') do set safepath=%%T
 
-if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome "%GSDLHOME%\%cgibin%\gsdlsite.cfg"') do set COLLECTHOME=%%G
+:: Doesn't work if there are spaces in the collecthome path in gsdlsite.cfg
+::if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome "%GSDLHOME%\%cgibin%\gsdlsite.cfg"') do set COLLECTHOME=%%G
+
+:: variable in subroutine concat is called gshome, 
+:: so forced to use it here for collecthome
+set gshome=
+if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" FOR /F "tokens=*" %%G IN ('findstr /R ^gsdlhome "%GSDLHOME%\%cgibin%\gsdlsite.cfg"') do (call :concat %%G)
+set COLLECTHOME=%gshome%
+set gshome=
+
 if "%COLLECTHOME%" == "" set COLLECTHOME=%GSDLHOME%\collect
 for /F "delims=*" %%T in ('"echo %COLLECTHOME%| %_sed% s@\\@\/@g"') do set safecollectpath=%%T