Changeset 30574 for gs3-extensions

Show
Ignore:
Timestamp:
16.06.2016 19:20:23 (3 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/solr/trunk/src/gs3-setup.bat

    r30532 r30574  
    1414set SOLR_PORT=8983 
    1515set SOLR_HOST=localhost 
     16 
     17setlocal enabledelayedexpansion 
     18set FOUNDPROPS= 
    1619:: Loosely based on  
    1720:: http://stackoverflow.com/questions/7708681/how-to-read-from-a-properties-file-using-batch-script  
    1821FOR /F "tokens=1,2 delims==" %%G IN (%GSDL3SRCHOME%\build.properties) DO (  
    19     if "%%G"=="tomcat.server" set SOLR_HOST=%%H 
    20     if "%%G"=="tomcat.port" set SOLR_PORT=%%H 
     22    if "%%G"=="tomcat.server" set SOLR_HOST=%%H& set FOUNDPROPS=!FOUNDPROPS!found 
     23    if "%%G"=="tomcat.port" set SOLR_PORT=%%H& set FOUNDPROPS=!FOUNDPROPS!found 
     24    :: break out of the loop as soon as both properties are found 
     25    if "!FOUNDPROPS!" == "foundfound" goto foundall 
    2126) 
     27endlocal 
     28 
     29:foundall 
    2230echo Tomcat host: %SOLR_HOST% 
    2331echo Tomcat port: %SOLR_PORT%