Changeset 21966 for main

Timestamp:

2010-04-27T14:39:12+12:00 (14 years ago)

Author:

ak19

Message:

Made changes to GLI and gs2-server.bat to allow GLI to deal with spaces in filepath (previously still a problem on Windows when GLI needed to launch gs2-server.bat). The issue was with the windows/batch start command: 1. the way it was launched in GLI and 2. the way windows deals with spaces in the PARAMETERS to the script launched with batch's start cmd. The corresponding changes that needed to be made to deal with these two aspects of the issue are in: gli's greenstone/LocalLibraryServer.java and gs2-server.bat.

File:

• main/trunk/greenstone2/gs2-server.bat (modified) (1 diff)

main/trunk/greenstone2/gs2-server.bat

@@ -152 +152 @@
 )
 echo.
-"%JAVA_EXECUTABLE%" org.greenstone.server.Server2 "%GSDLHOME%" "%serverlang%" %*
-::echo ******* Second argument to gs2-server.bat is: %2
-:: The 1st argument to gs2-server.bat (if any) would be --config, the 2nd is the config
-:: filename if it is glisite.cfg, then this script was launched through GLI and would 
-:: have opened a DOS console. Need to exit from this script then to close the console.
-if "%2" == "%GSDLHOME%\glisite.cfg" goto quitcmd
+
+:: GLI launches gs2-server.bat with:
+:: cmd /c start "window" "c:\path to\gs2-server.bat" --config=c:\path to\glisite.cfg [--quit=portnum]
+:: The configfile param could contain spaces, in which case its space-separated parts spread over 
+:: multiple parameters . Need to handle things the following way, since using quotes to embed the 
+:: parameters breaks the start command, see http://ss64.com/nt/start.html
+:: This script is launched by the start cmd as:
+:: "c:\path to\gs2-server.bat" --config=c:\path to\config.cfg [--quit=portnum]. 
+:: But if the parameter  following --config=<some string> doesn't start with a double hyphen, we
+:: assume it to be part of the config parameter, as the configfile path may have contained spaces.
+
+:: Store all parameters together in config file var: we may or may not have a portnumber
+:: Get everything after the "--quit=", if anything, and store it in port var.  If no port, nothing to do.
+set conf=%*
+set port=%conf:*--quitport=%
+if "%conf%" == "%port%" (
+set port=
+goto :runit
+) else (
+set port=%port:~1%
+)
+
+:: Because we got here, need to adjust conf by removing " --quitport=" from it and prefixing this to port
+call set conf=%%conf:%port%=%%
+set conf=%conf:~0,-12%
+set port=--quitport=%port%
+
+:: Remove trailing spaces from conf and port
+:: (We'll put the all-important quotes around conf and port when the actual java cmd is launched)
+set tmp=%conf%
+call :trim %tmp%
+set conf=%tmp%
+set tmp=%port%
+call :trim %port%
+set port=%tmp%
+set tmp=
+
+goto :runit
+
+::  http://www.computing.net/answers/programming/dos-batch-remove-trailing-space/9270.html
+:trim
+set tmp=%*
+goto :eof
+
+:runit 
+::echo port: %port%& echo conf: %conf%& echo.& echo.
+:: "%JAVA_EXECUTABLE%" org.greenstone.server.Server2 "%GSDLHOME%" "%serverlang%" %*
+"%JAVA_EXECUTABLE%" org.greenstone.server.Server2 "%GSDLHOME%" "%serverlang%" "%conf%" "%port%"
+
+
+:: The 1st argument to gs2-server.bat (if any) would be --config, the 2nd is the config filename. 
+:: Both are stored in %conf% now. If the config file is glisite.cfg, then this script was launched through
+:: GLI and would have opened a DOS console. Need to exit from this script then to close the console.
+:: Remove --config= prefix and do a case insensitive comparison, since filepaths can have uppercase chars
+if /i "%conf:~9%" == "%GSDLHOME%\glisite.cfg" goto quitcmd
 goto exit