Changeset 19970 for gsdl/trunk/gsicontrol.bat

Timestamp:

2009-07-08T14:47:08+12:00 (15 years ago)

Author:

ak19

Message:

Added some further commands. portcon now allows one to specify the port and connection. This still needs to be called by the apache configure target. The functionality of gsicontrol isn't complete yet.

File:

• gsdl/trunk/gsicontrol.bat (modified) (7 diffs)

gsdl/trunk/gsicontrol.bat

@@ -1 +1 @@
 @echo off
 
+setlocal
 set testdone=0
 set target=%1
 set configfile=%2
 
-set MONITOR_SUCCESS="MAKE SUCCESSFUL"
-set MONITOR_FAILED="MAKE FAILED"
-set MONITOR_FINISHED="MAKE DONE"
+:: Need to get greenstone installation directory
+:: set cwd=%CD%
+
+set MONITOR_SUCCESS=MAKE SUCCESSFUL
+set MONITOR_FAILED=MAKE FAILED
+set MONITOR_FINISHED=MAKE DONE
 
 :: check that we have >=1 and <=2 arguments
@@ -20 +24 @@
 echo    Usage: %0 command
 echo           where command is any of the following: 
-::echo    web-start
-::echo    web-stop
-::echo    web-restart
-::echo    web-status
-::echo    web-graceful
+echo    web-start
+echo    web-stop
+echo    web-restart
 echo    configure-admin
 echo    configure-web    [config-filename]
 echo    configure-apache [config-filename]
 echo    configure-cgi
+
+::echo    web-status
+::echo    web-graceful
 ::echo    test-gsdlhome
 ::echo    web-stop-tested
@@ -62 +67 @@
 if "%target%" == "configure-cgi" goto cfgcgi
 if "%target%" == "test-gsdlhome" goto testgsdl
+if "%target%" == "portcon" goto portcon1
     :: unknown command
     goto usage
 
 :start
+"%GSDLHOME%\bin\windows\starthttpd.exe" GS2_APACHE_HTTPD "%GSDLHOME%\apache-httpd\windows\bin\httpd.exe"
+echo %MONITOR_SUCCESS%
+echo %MONITOR_FINISHED%
+goto exit
+
 :stop
+if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" GS2_APACHE_HTTPD
+rem if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\apache-httpd\%GSDLOS%\bin\apachectl" stop
+echo %MONITOR_SUCCESS%
+echo %MONITOR_FINISHED% 
+goto exit
+
 :restart
+if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" GS2_APACHE_HTTPD
+:: wait 2s, see http://malektips.com/dos0017.html. The 2 in the 2nd line is variable
+ping 127.0.0.1 -n 2 -w 1000 > nul
+ping 127.0.0.1 -n 2 -w 1000> nul
+::"%GSDLHOME%\bin\windows\starthttpd.exe" GS2_APACHE_HTTPD "%GSDLHOME%\apache-httpd\windows\bin\httpd.exe"
+goto start
+
 :status
 :graceful
-:stoptest
-echo Command %target% is not yet operational (no local apache web server included in this release).
+::echo Command %target% is not yet operational (no local apache web server included in this release).
 goto exit
 
-rem :stoptest
+:stoptest
+if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" GS2_APACHE_HTTPD
 rem if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\apache-httpd\%GSDLOS%\bin\apachectl" stop
-rem goto exit
+goto exit
 
 ::configure-web
@@ -82 +106 @@
 :cfgweb
 :cfgcgi
-if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" echo WARNING: Nothing done for make configure-cgi.
-if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" echo    If you wish to regenerate the file 
-if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" echo    %GSDLHOME%\cgi-bin\gsdlsite.cfg
-if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" echo    from scratch, delete the existing file first.
-if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" goto cgifin
+if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" goto cgimsg
     echo Configuring cgi-bin\gsdlsite.cfg
     set gsdlpath=%GSDLHOME%
@@ -93 +113 @@
     set gsdlpath=
     set safepath=
+    goto cgifin
+
+:cgimsg
+echo WARNING: Nothing done for make configure-cgi.
+echo    If you wish to regenerate the file
+echo    %GSDLHOME%\cgi-bin\gsdlsite.cfg
+echo    from scratch, delete the existing file first.
+echo.
 
 :cgifin
-echo.
 if "%target%" == "configure-cgi" goto exit
 if "%target%" == "configure-web" goto cfgapach
@@ -115 +142 @@
 :: Have to create an intermediate file in the following, because echoing
 :: lines straight into a pipe adds spaces before the end of each line.
-:: When piping need to double escape angle brackets with three hat signs,
+:: When piping, need to double-escape the angle brackets with three hat signs,
 :: but when redirecting to a file, need to escape only once (one hat sign). 
 if ERRORLEVEL 0 (
@@ -132 +159 @@
 goto exit
 
+::configure-port-and-connection
+:portcon1
+set /p port=Enter port number to use:
+set /p connect=Allow external connections [yes/no]:
+if "%connect%" == "yes" set allowfrom="all" goto portcon2
+if "%connect%" == "y" set allowfrom="all" goto portcon2
+set allowfrom="127.0.0.1"
+
+:portcon2
+if "%port%" == "" goto exit
+    set _sed="bin\windows\sed.exe"
+    set gsdlpath=%GSDLHOME%
+    for /F "delims=*" %%T in ('"echo %gsdlpath%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T
+
+    echo Port: %port%
+    echo Stopping web server (if running)
+    if not exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" echo missing conf file
+    if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" GS2_APACHE_HTTPD
+    echo Setting config file to use port %port%
+bin\windows\sed.exe "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg
+    type "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf.in" | %_sed% "s@\*\*PORT\*\*@%port%@g" | %_sed% "s@\*\*CONNECTION\*\*@%allowfrom%@g" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" | %_sed% "s@\*\*APACHE_HOME_OS\*\*@%safepath%\/apache-httpd\/%GSDLOS%@g" > "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf"
+    echo Type '%0 web-start' to start the web server running on port %port%
+    echo Done
+    set port=
+    set connect=
+    set allowfrom=
+    set _sed=
+    set safepath=
+    set gsdlpath=
+
 
 :exit
-set testdone=
-set target=
-set configfile=
-set MONITOR_SUCCESS=
-set MONITOR_FAILED=
-set MONITOR_FINISHED=
+endlocal