Changeset 30574 for gs3-extensions/solr/trunk/src/gs3-setup.bat

Timestamp:

2016-06-16T19:20:23+12:00 (8 years ago)

Author:

ak19

Message:

Improving dispersed GS3: changes to util.pm fix the bug whereby the perl code always write to gs2build\tmp when building, even if the Greenstone folder is not writable. Now the TMP env var location is used and the tmp files get written to TMP\greenstone\web when the GS folder is not writable. Further tidied up bat and cmd files to remove extra variables, to break out of loop reading in build.properties file when the necessary properties are found.

File:

• gs3-extensions/solr/trunk/src/gs3-setup.bat (modified) (1 diff)

gs3-extensions/solr/trunk/src/gs3-setup.bat

@@ -14 +14 @@
 set SOLR_PORT=8983
 set SOLR_HOST=localhost
+
+setlocal enabledelayedexpansion
+set FOUNDPROPS=
 :: Loosely based on 
 :: http://stackoverflow.com/questions/7708681/how-to-read-from-a-properties-file-using-batch-script 
 FOR /F "tokens=1,2 delims==" %%G IN (%GSDL3SRCHOME%\build.properties) DO ( 
-    if "%%G"=="tomcat.server" set SOLR_HOST=%%H
-    if "%%G"=="tomcat.port" set SOLR_PORT=%%H
+    if "%%G"=="tomcat.server" set SOLR_HOST=%%H& set FOUNDPROPS=!FOUNDPROPS!found
+    if "%%G"=="tomcat.port" set SOLR_PORT=%%H& set FOUNDPROPS=!FOUNDPROPS!found
+    :: break out of the loop as soon as both properties are found
+    if "!FOUNDPROPS!" == "foundfound" goto foundall
 )
+endlocal
+
+:foundall
 echo Tomcat host: %SOLR_HOST%
 echo Tomcat port: %SOLR_PORT%