Changeset 30568 for main/trunk/greenstone3/gs3-server.bat

Timestamp:

2016-06-10T22:11:15+12:00 (8 years ago)

Author:

ak19

Message:

All the commits for a distributed GS3 on Windows (no changes made for linux yet). In a distributed GS3, the GS3 is installed in a read-only location and the tomcat runs from the writable TMP area, while the collections go to a writable userweb location specified by the user. (The DVD-only mode still works and is separate.) A problem remains, but exists in the TSG patched version too, and since the current commit breaks nothing, I'm committing it. The user needs to modify 4 properties in build.properties, one of which is new.They need to set using.user.web to true, set web.home to the userweb location, set gsdl3home.isreadonly to true and set gsdl3.writablehome to the tmpdir. The problem is that I can't successfully build the simple html collection if the GS3 installed location is read-only, as the perl code wants to create temporary files in gs2build\tmp which is read-only.

File:

• main/trunk/greenstone3/gs3-server.bat (modified) (1 diff)

main/trunk/greenstone3/gs3-server.bat

@@ -16 +16 @@
 if "%GSDL3SRCHOME%" == "" call "%GSDL3PATH%\gs3-setup.bat" SetEnv > nul
 
+set USE_TMPDIR_FOR_TOMCAT=
+for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do ( 
+    if "%%G"=="gsdl3home.isreadonly" set USE_TMPDIR_FOR_TOMCAT=%%H
+)
 
+:: If the gsdl3.home readonly property is not already set to true, then
 :: See if Greenstone3 web folder is writable
+if "%USE_TMPDIR_FOR_TOMCAT%" == "false" (
   echo.
   echo Checking if the Greenstone3 web directory is writable ...
   (echo This is a temporary file. It is safe to delete it. > "%GSDL3HOME%\testing.tmp" ) 2>nul
   if exist "%GSDL3HOME%\testing.tmp" goto isWritable
+)
 
 :: Is read-only
   set gsdl3_writablehome=%TMP%\greenstone\web
   set opt_properties="-Dgsdl3home.isreadonly=true" -Dgsdl3.writablehome="%gsdl3_writablehome%"
-  echo ... no.
+  if "%USE_TMPDIR_FOR_TOMCAT%" == "false" echo ... no.
   echo Setting Greenstone3 web home writable area to be: %gsdl3_writablehome%