Ignore:
Timestamp:
2009-01-12T11:04:15+13:00 (15 years ago)
Author:
kjdon
Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318

Location:
gli/branches/rtl-gli
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • gli/branches/rtl-gli

    • Property svn:ignore set to
      jar
      GLIServer.jar
      GLI.jar

  • gli/branches/rtl-gli/gli.bat

    r13027 r18351  
    11@echo off
     2color 0A
     3pushd "%CD%"
     4CD /D "%~dp0"
    25set GLILANG=en
    36
    … …  
    1518
    1619:start
    17 if "%OS%" == "Windows_NT" goto findGSDL
     20if "%OS%" == "Windows_NT" goto progName
    1821    :: Invoke a new command processor to ensure there's enough environment space
    19     if "%1" == "Second" goto findGSDL
     22    if "%1" == "Second" goto progName
    2023        command /E:2048 /C %0 Second %1 %2 %3 %4 %5 %6 %7 %8 %9
    2124        goto done
    2225
     26
     27:progName
     28if not "%PROGNAME%" == "" goto findGSDL
     29    :: otherwise PROGNAME was not set, so default to the Greenstone Librarian Interface (GLI) program
     30    if "%GLILANG%" == "es" set PROGNAME=Biblioteca Digital Greenstone
     31    if "%GLILANG%" == "fr" set PROGNAME=Bibliothécaire Greenstone
     32    if "%GLILANG%" == "ru" set PROGNAME=ÉÎÔÅÒÆÅÊÓ Greenstone
     33    :: if the PROGNAME is still not set, then set the language to English
     34    if "%PROGNAME%" == "" set PROGNAME=Greenstone Librarian Interface
     35
     36
     37if "%PROGABBR%" == "" set PROGABBR=GLI
     38if "%PROGNAME_EN%" == "" set PROGNAME_EN=Greenstone Librarian Interface
     39
    2340:findGSDL
    2441echo.
    25 if "%GLILANG%" == "en" echo Greenstone Librarian Interface (GLI)
    26 if "%GLILANG%" == "en" echo Copyright (C) 2006, New Zealand Digital Library Project, University Of Waikato
    27 if "%GLILANG%" == "en" echo GLI comes with ABSOLUTELY NO WARRANTY; for details see LICENSE.txt
     42if "%GLILANG%" == "en" echo %PROGNAME% (%PROGABBR%)
     43if "%GLILANG%" == "en" echo Copyright (C) 2008, New Zealand Digital Library Project, University Of Waikato
     44if "%GLILANG%" == "en" echo %PROGABBR% comes with ABSOLUTELY NO WARRANTY; for details see LICENSE.txt
    2845if "%GLILANG%" == "en" echo This is free software, and you are welcome to redistribute it
    2946
    30 if "%GLILANG%" == "es" echo Interfaz de la Biblioteca Digital Greenstone (Greenstone Librarian Interface - GLI)
    31 if "%GLILANG%" == "es" echo Copyright (C) 2006, New Zealand Digital Library Project, University Of Waikato
    32 if "%GLILANG%" == "es" echo La Interfaz de la Biblioteca Digital Greenstone NO INCLUYE ABSOLUTAMENTE NINGUNA GARANTÖA.
     47if "%GLILANG%" == "es" echo Interfaz de la %PROGNAME% (%PROGNAME_EN% - %PROGABBR%)
     48if "%GLILANG%" == "es" echo Copyright (C) 2008, New Zealand Digital Library Project, University Of Waikato
     49if "%GLILANG%" == "es" echo La Interfaz de la %PROGNAME% NO INCLUYE ABSOLUTAMENTE NINGUNA GARANTÖA.
    3350if "%GLILANG%" == "es" echo Para mayor informaci¢n vea los t‚rminos de la licencia en LICENSE.txt
    3451if "%GLILANG%" == "es" echo Este es un software abierto, por lo que lo invitamos a que lo distribuya de forma gratuita
    3552
    36 if "%GLILANG%" == "fr" echo Interface du Biblioth‚caire Greenstone (Greenstone Librarian Interface - GLI)
    37 if "%GLILANG%" == "fr" echo Copyright (C) 2006, New Zealand Digital Library Project, University Of Waikato
    38 if "%GLILANG%" == "fr" echo GLI est fourni sans AUCUNE GARANTIE; pour des d‚tails, voir LICENSE.txt
     53if "%GLILANG%" == "fr" echo Interface du %PROGNAME% (%PROGNAME_EN% - %PROGABBR%)
     54if "%GLILANG%" == "fr" echo Copyright (C) 2008, New Zealand Digital Library Project, University Of Waikato
     55if "%GLILANG%" == "fr" echo %PROGABBR% est fourni sans AUCUNE GARANTIE; pour des d‚tails, voir LICENSE.txt
    3956if "%GLILANG%" == "fr" echo Ceci est un logiciel libre, et vous ˆtes invit‚
    4057 le redistribuer
    4158
    42 if "%GLILANG%" == "ru" echo š¡«š®â¥ç­ë© š­â¥à䥩á Greenstone (Greenstone Librarian Interface - GLI)
    43 if "%GLILANG%" == "ru" echo Copyright (C) 2006, New Zealand Digital Library Project, University Of Waikato
     59if "%GLILANG%" == "ru" echo š¡«š®â¥ç­ë© š­â¥à䥩á %PROGNAME% (%PROGNAME_EN% - %PROGABBR%)
     60if "%GLILANG%" == "ru" echo Copyright (C) 2008, New Zealand Digital Library Project, University Of Waikato
    4461if "%GLILANG%" == "ru" echo ˆƒ ­¥ € ¥â €‘Ž‹ž’Ž ˆŠ€Šˆ• ƒ€€’ˆ‰; €¥â «š á¬. ¢ ⥪á⥠LICENSE.TXT
    4562if "%GLILANG%" == "ru" echo â® - ᢮¡®€­® à á¯à®áâ࠭塞®¥ ¯à®£à ¬¬­®¥ ®¡¥á¯¥ç¥­š¥ š ‚ë ¬®Š¥â¥ à á¯à®áâà ­ïâì ¥£®
    4663
    4764echo.
    48 ::  ---- Determine GSDLHOME ----
     65::  ---- Determine path to Greenstone home for GS2 and GS3 ----
    4966set GSDLPATH=
    50 
    51 :: Some users may set the above line manually
    52 if not "%GSDLPATH%" == "" goto testGSDL
    53 
    54     :: The default location for the GLI is a subdirectory of Greenstone
    55     set GSDLPATH=..
    56 
    57     :: If it is set, use the GSDLHOME environment variable
    58     if "%GSDLHOME%" == "" goto testGSDL
    59     set GSDLPATH=%GSDLHOME%
     67:: Some users may set the above line manually, or it may be set as an argument
     68
     69set _VERSION=
     70if not "%GSDLPATH%" == "" goto getVer
     71    :: Otherwise gsdlpath is not yet set
     72    :: Check the env vars first
     73    if not "%GSDL3SRCHOME%" == "" goto ver3
     74        if not "%GSDLHOME%" == "" goto ver2
     75            :: If not set, the default location for the GLI is a subdirectory of Greenstone
     76            set GSDLPATH=..
     77            goto getVer
     78
     79:getVer
     80call gsdlver.bat %GSDLPATH% %_VERSION% > nul
     81if "%_VERSION%" == "1" goto exit
     82::if we are running GS2, free up any pre-set GS3 environment variables since we won't need them
     83if "%_VERSION%" == "2" set GSDL3SRCHOME=
     84if "%_VERSION%" == "2" set GSDL3HOME=
     85goto testGSDL
     86
     87
     88:ver3
     89set _VERSION=3
     90set GSDLPATH=%GSDL3SRCHOME%
     91:: if GS2 is now also set, then both GS3 and GS2 are set:
     92:: warn the user that we have defaulted to GS3
     93if not "%GSDLHOME%" == "" echo Both Greenstone 2 and Greenstone 3 environments are set.
     94if not "%GSDLHOME%" == "" echo It is assumed you want to run Greenstone 3.
     95if not "%GSDLHOME%" == "" echo If you want to run Greenstone 2, please unset the
     96if not "%GSDLHOME%" == "" echo environment variable GSDL3SRCHOME before running GLI.
     97if not "%GSDLHOME%" == "" echo.
     98goto testGSDL
     99
     100
     101:ver2
     102set _VERSION=2
     103set GSDLPATH=%GSDLHOME%
     104::free up the GS3 environment variables since we are running GS2 and don't need them
     105set GSDL3SRCHOME=
     106set GSDL3HOME=
     107goto testGSDL
     108
    60109
    61110:testGSDL
    62 :: Check that the Greenstone installation looks OK
    63 if "%GLILANG%" == "en" echo Checking GSDL: %GSDLPATH%
    64 if "%GLILANG%" == "es" echo Revisando GSDL: %GSDLPATH%
    65 if "%GLILANG%" == "fr" echo V‚rification de GSDL: %GSDLPATH%
    66 if "%GLILANG%" == "ru" echo à®¢¥àª  GSDL: %GSDLPATH%
    67 if exist "%GSDLPATH%\setup.bat" goto prepGSDL
    68     echo.
    69     if "%GLILANG%" == "en" echo The Greenstone installation could not be found, or is incomplete.
    70     if "%GLILANG%" == "en" echo Try reinstalling Greenstone then running this script again.
    71 
    72     if "%GLILANG%" == "es" echo No se pudo encontrar la instalaci¢n de Greenstone o est  incompleta.
    73     if "%GLILANG%" == "es" echo Trate de reinstalar Greenstone y a continuaci¢n ejecute nuevamente este gui¢n.
    74 
    75     if "%GLILANG%" == "fr" echo L'installation de Greenstone est introuvable ou incomplŠte. Essayez
    76     if "%GLILANG%" == "fr" echo de r‚installer Greenstone et ex‚cutez ce script
    77  nouveau.
    78 
    79     if "%GLILANG%" == "ru" echo ˆ­áâ ««ïæšï Greenstone ­¥ ¡ë«  ­ ©€¥­  š«š ®­  ­¥¯®«­ . ®¯à®¡ã©â¥ ¯®¢â®à­®
    80     if "%GLILANG%" == "ru" echo ãáâ ­®¢šâì Greenstone,   § â¥¬ ¢¢¥áâš íâ®â áªàš¯â á­®¢ .
    81     goto exit
     111set CHECK=1
     112call chkinst.bat "%GSDLPATH%" %_VERSION% %GLILANG% %CHECK% > nul
     113if "%CHECK%" == "1" goto exit
     114    :: otherwise installation worked well
     115    goto prepGSDL
     116
    82117
    83118:prepGSDL
    84 :: Setup Greenstone, unless it has already been done
     119:: Greenstone 3 case
     120if "%_VERSION%" == "3" goto prepGS3
     121
     122if not "%_VERSION%" == "2" echo "Greenstone version unknown"
     123if not "%_VERSION%" == "2" goto :exit
     124
     125:: Otherwise, we are dealing with Greenstone 2
     126:: Setup Greenstone 2, unless it has already been done
    85127if not "%GSDLHOME%" == "" goto doneGSDL
    86     call "%GSDLPATH%\setup.bat" SetEnv > nul
     128    call "%GSDLPATH%\setup.bat" SetEnv
     129    goto doneGSDL
     130
     131
     132:prepGS3
     133set GSDL2PATH=
     134: Some users may set the above line manually
     135
     136if "%GSDL3SRCHOME%" == "" goto setup3
     137    if "%GSDL3HOME%" == "" goto setup3
     138        ::otherwise
     139        goto gs2build
     140
     141
     142:setup3
     143:: Setup Greenstone 3, unless it has already been done
     144    cd | winutil\setvar.exe GLIDIR > %TMP%\setgli.bat
     145    call %TMP%\setgli.bat
     146    del %TMP%\setgli.bat
     147    cd "%GSDLPATH%"
     148    call gs3-setup.bat SetEnv
     149    cd %GLIDIR%
     150    goto gs2build
     151
     152
     153:gs2build
     154    :: If Greenstone version 3 is running, we want to set gsdl2path
     155    :: Determine GSDLHOME for GS3
     156    if not "%GSDL2PATH%" == "" goto setupGS2
     157        :: GSDL2PATH is not yet set.
     158        :: And if GSDLHOME is not set either, then assume
     159        :: that the gs2build subdir of GS3 exists
     160        if "%GSDLHOME%" == "" set GSDL2PATH=%GSDL3SRCHOME%\gs2build
     161        if "%GSDLHOME%" == "" goto setupGS2
     162            :: Otherwise GSDLHOME is set, so set GSDL2PATH to GSDLHOME
     163            echo GSDLHOME environment variable is set to %GSDLHOME%.   
     164            echo Will use this to find build scripts.
     165            set GSDL2PATH=%GSDLHOME%
     166
     167:setupGS2
     168set CHECK=1
     169call chkinst.bat "%GSDL2PATH%" 2 %GLILANG% %CHECK% > nul
     170if "%CHECK%" == "1" goto exit
     171    :: otherwise installation worked well
     172    :: Setup Greenstone, unless it has already been done
     173    if "%GSDLHOME%" == "" call "%GSDL2PATH%\setup.bat" SetEnv
     174    :: Either way, we can now dispose of GSDL2PATH
     175    set GSDL2PATH= 
     176    goto doneGSDL
     177
    87178
    88179:doneGSDL
    … …  
    95186set PERLPATH=
    96187
    97 :: Some users may set the above line manually
     188:: Some users may set the above line manually - If you do this, you need to
     189:: make sure that perl is in your path otherwise lucene collections may not
     190:: work
    98191if not "%PERLPATH%" == "" goto testPerl
    99192
    100193    :: Check if Perl is on the search path
    101     echo %PATH%| winutil\which.exe perl.exe | winutil\setvar.exe PERLPATH > setperl.bat
    102     call setperl.bat
    103     del setperl.bat
     194    echo %PATH%| winutil\which.exe perl.exe | winutil\setvar.exe PERLPATH > %TMP%\setperl.bat
     195    call %TMP%\setperl.bat
     196    del %TMP%\setperl.bat
    104197    if not "%PERLPATH%" == "" goto testPerl
    105198
    … …  
    108201
    109202    :: Still haven't found anything, so try looking in the registry (gulp!)
    110     type nul > perl.reg
    111     regedit /E perl.reg "HKEY_LOCAL_MACHINE\SOFTWARE\Perl"
    112     type perl.reg > perl.txt
    113     del perl.reg
    114 
    115     winutil\findperl.exe perl.txt | winutil\setvar.exe PERLPATH > setperl.bat
    116     del perl.txt
    117     call setperl.bat
    118     del setperl.bat
     203    type nul > %TMP%\perl.reg
     204    regedit /E %TMP%\perl.reg "HKEY_LOCAL_MACHINE\SOFTWARE\Perl"
     205    type %TMP%\perl.reg > %TMP%\perl.txt
     206    del %TMP%\perl.reg
     207
     208    winutil\findperl.exe %TMP%\perl.txt | winutil\setvar.exe PERLPATH > %TMP%\setperl.bat
     209    del %TMP%\perl.txt
     210    call %TMP%\setperl.bat
     211    del %TMP%\setperl.bat
    119212
    120213    :: If nothing was found in the registry, we're stuck
    121214    if "%PERLPATH%" == "" goto noPerl
    122215
     216    :: if have found perl in registry, but not in path, then we need to
     217    :: add it to path for lucene stuff.
     218    if "%OS%" == "Windows_NT" set PATH=%PATH%;%PERLPATH%
     219    if "%OS%" == "" set PATH="%PATH%";"%PERLPATH%"
    123220    goto testPerl
    124221
    125222:gsdlPerl
    126223    set PERLPATH=%GSDLHOME%\bin\windows\perl\bin
    127 
     224       
    128225:testPerl
    129226:: Check that a Perl executable has been found
    130 if "%GLILANG%" == "en" echo Checking Perl: %PERLPATH%
    131 if "%GLILANG%" == "es" echo Revisando Perl: %PERLPATH%
    132 if "%GLILANG%" == "fr" echo V‚rification de Perl: %PERLPATH%
    133 if "%GLILANG%" == "ru" echo à®¢¥àª  Perl: %PERLPATH%
    134 if exist "%PERLPATH%\perl.exe" goto findJava
     227if not exist "%PERLPATH%\perl.exe" goto noPerl
     228echo Perl:
     229echo %PERLPATH%
     230echo.
     231
     232goto findJava
    135233
    136234:noPerl
    137235    echo.
    138     if "%GLILANG%" == "en" echo The Greenstone Librarian Interface requires perl in order to operate,
    139     if "%GLILANG%" == "en" echo but perl could not be detected on your system. Please ensure that perl
    140     if "%GLILANG%" == "en" echo is installed and is on your search path, then rerun this script.
     236    if "%GLILANG%" == "en" echo The Greenstone Librarian Interface requires Perl in order to operate,
     237    if "%GLILANG%" == "en" echo but Perl could not be detected on your system. Please ensure that Perl
     238    if "%GLILANG%" == "en" echo is installed and is on your search path, then try again.
    141239
    142240    if "%GLILANG%" == "es" echo La Interfaz de la Biblioteca Digital Greenstone requiere Perl para poder
    … …  
    158256
    159257:findJava
    160 :: ---- Check Java exists ----
    161 set JAVAPATH=
    162 
    163 :: Some users may set the above line manually
    164 if not "%JAVAPATH%" == "" goto testJava
    165 
    166     :: If it is set, use the JAVA_HOME environment variable
    167     if not "%JAVA_HOME%" == "" goto javahome
    168 
    169     :: Check if Java is on the search path
    170     echo %PATH%| winutil\which.exe java.exe | winutil\setvar.exe JAVAPATH > setjava.bat
    171     call setjava.bat
    172     del setjava.bat
    173     if not "%JAVAPATH%" == "" goto testJava
    174 
    175     :: Still haven't found anything, so try looking in the registry (gulp!)
    176     type nul > jdk.reg
    177     regedit /E jdk.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit"
    178     type jdk.reg > jdk.txt
    179     del jdk.reg
    180     type nul > jre.reg
    181     regedit /E jre.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment"
    182     type jre.reg > jre.txt
    183     del jre.reg
    184 
    185     winutil\findjava.exe jdk.txt jre.txt | winutil\setvar.exe JAVAPATH > setjava.bat
    186     del jdk.txt
    187     del jre.txt
    188     call setjava.bat
    189     del setjava.bat
    190 
    191     :: If nothing was found in the registry, we're stuck
    192     if "%JAVAPATH%" == "" goto noJava
    193 
    194     set JAVAPATH=%JAVAPATH%\bin
    195     goto testJava
    196 
    197 :javahome
    198     set JAVAPATH=%JAVA_HOME%\bin
    199 
    200 :testJava
    201 :: Check that a Java executable has been found
    202 if "%GLILANG%" == "en" echo Checking Java: %JAVAPATH%
    203 if "%GLILANG%" == "es" echo Revisando Java: %JAVAPATH%
    204 if "%GLILANG%" == "fr" echo V‚rification de Java: %JAVAPATH%
    205 if "%GLILANG%" == "ru" echo à®¢¥àª  Java: %JAVAPATH%
    206 if exist "%JAVAPATH%\java.exe" goto checkGLI
     258    if "%_VERSION%" == "2" (
     259        set SEARCH4J_EXECUTABLE=%GSDLHOME%\bin\windows\search4j.exe
     260        set HINT=%GSDLHOME%\packages\jre
     261    )
     262    if "%_VERSION%" == "3" (
     263        set SEARCH4J_EXECUTABLE=%GSDL3SRCHOME%\bin\search4j.exe
     264        set HINT=%GSDL3SRCHOME%\packages\jre
     265    )
     266   
     267    "%SEARCH4J_EXECUTABLE%" -e -m "1.4.0_00" -p "%HINT%" | winutil\setvar.exe JAVA_EXECUTABLE > %TMP%\set_java_executable.bat
     268    call "%TMP%\set_java_executable.bat"
     269    del "%TMP%\set_java_executable.bat"
     270   
     271    if "%JAVA_EXECUTABLE%" == "" goto noJava
     272    echo Java:
     273    echo %JAVA_EXECUTABLE%
     274    echo.
     275
     276    goto checkGLI
    207277
    208278:noJava
    … …  
    212282    if "%GLILANG%" == "en" echo Greenstone Librarian Interface.
    213283
    214     if "%GLILANG%" == "es" echo No se pudo localizar una versi¢n apropiada de Java. Usted deber 
     284    if "%GLILANG%" == "es" echo No se pudo localizar una versi¢n apropiada de Java. Usted deber 
    215285    if "%GLILANG%" == "es" echo instalar un Ambiente de Ejecuci¢n Java (versi¢n 1.4 o superior)
    216286    if "%GLILANG%" == "es" echo antes de correr la Interfaz de la Biblioteca Digital Greenstone.
    217287
    218     if "%GLILANG%" == "fr" echo Une version ad‚quate de Java n'a pas pu ˆtre localis‚e. Vous devez
    219     if "%GLILANG%" == "fr" echo installer un Java Runtime Environment (version 1.4 ou sup‚rieur)
    220     if "%GLILANG%" == "fr" echo avant de d‚marrer Greenstone Librarian Interface.
    221 
    222     if "%GLILANG%" == "ru" echo ¥ 〠«®áì ®¯à¥€¥«šâì ¬¥áâ®­ å®Š€¥­š¥ ᮮ⢥âáâ¢ãî饩 ¢¥àášš Java.
    223     if "%GLILANG%" == "ru" echo ‚ë €®«Š­ë ãáâ ­®¢šâì Java Runtime Environment (¢¥àášî 1.4 š«š ¢ëè¥) ¯¥à¥€ ¢¢®€®¬
    224     if "%GLILANG%" == "ru" echo ¡š¡«š®â¥ç­®£® š­â¥àä¥©á  Greenstone.
     288    if "%GLILANG%" == "fr" echo Une version ad?quate de Java n'a pas pu ?tre localis?e. Vous devez
     289    if "%GLILANG%" == "fr" echo installer un Java Runtime Environment (version 1.4 ou sup?rieur)
     290    if "%GLILANG%" == "fr" echo avant de d?marrer Greenstone Librarian Interface.
     291
     292    if "%GLILANG%" == "ru" echo ¥ 〠«®áì ®¯à¥€¥«šâì ¬¥áâ®­ 宊€¥­š¥ ᮮ⢥âáâ¢ãî饩 ¢¥àᚚ Java.
     293    if "%GLILANG%" == "ru" echo ?ë €®«Š­ë ãáâ ­®¢šâì Java Runtime Environment (¢¥àášî 1.4 š«š ¢ëè¥) ¯¥à¥€ ¢¢®€®¬
     294    if "%GLILANG%" == "ru" echo ¡š¡«š®â¥ç­®£® š­â¥à䥩á Greenstone.
    225295    goto exit
    226 
    227296
    228297:checkGLI
    … …  
    246315
    247316:runGLI
     317
     318if not "%_VERSION%" == "" (
     319    echo Greenstone Major Version:
     320    echo %_VERSION%
     321    echo.
     322)
     323
     324if not "%GSDL3SRCHOME%" == "" (
     325    echo GSDL3SRCHOME:
     326    echo %GSDL3SRCHOME%
     327    echo.
     328)
     329
     330if not "%GSDL3HOME%" == "" (
     331    echo GSDL3HOME:
     332    echo %GSDL3HOME%
     333    echo.
     334)
     335
     336if not "%GSDLHOME%" == "" (
     337    echo GSDLHOME:
     338    echo %GSDLHOME%
     339    echo.
     340)
     341
     342:: ---- Explain how to bypass Imagemagick and Ghostscript bundled with Greenstone if needed ----
     343echo.
     344if exist "%GSDLHOME%\bin\windows\ghostscript\bin\*.*" echo GhostScript bundled with Greenstone will be used, if you wish to use the version installed on your system (if any) please go to %GSDLHOME%\bin\windows and rename the folder called ghostscript to something else.
     345echo.
     346echo.
     347if exist "%GSDLHOME%\bin\windows\imagemagick\*.*" echo ImageMagick bundled with Greenstone will be used, if you wish to use the version installed on your system (if any) please go to %GSDLHOME%\bin\windows and rename the folder called imagemagick to something else.
     348echo.
     349echo.
     350
     351
    248352:: ---- Finally, run the GLI ----
    249 echo.
    250 
    251 if "%GLILANG%" == "en" echo Running the Greenstone Librarian Interface...
    252 if "%GLILANG%" == "es" echo Ejecutando la Interfaz de la Biblioteca Digital Greenstone...
    253 if "%GLILANG%" == "fr" echo Ex‚cution de Greenstone Librarian Interface
    254 if "%GLILANG%" == "ru" echo ’¥ªãéš© ¡š¡«š®â¥ç­ë© š­â¥à䥩á Greenstone...
     353if "%GLILANG%" == "en" echo Running the %PROGNAME%...
     354if "%GLILANG%" == "es" echo Ejecutando la %PROGNAME%...
     355if "%GLILANG%" == "fr" echo Ex‚cution de %PROGNAME%
     356if "%GLILANG%" == "ru" echo ’¥ªãéš© ¡š¡«š %PROGNAME%...
    255357
    256358:: -Xms32M          To set minimum memory
    … …  
    261363:: -Xloggc:<file>   Write garbage collection log
    262364
    263 if exist "%GSDLHOME%\server.exe" goto localLib
     365
     366:: Run GS3 if version = 3
     367if "%_VERSION%" == "3" "%JAVA_EXECUTABLE%" -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -gsdlos %GSDLOS% -gsdl3 %GSDL3HOME% -gsdl3src %GSDL3SRCHOME% -perl %PERLPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9
     368if "%_VERSION%" == "3" goto finRun
     369
     370:: Run GS2 since version is 2:
     371:: if FLI is running, we don't want the local Greenstone library server running
     372if "%PROGABBR%" == "FLI" goto webLib
     373    :: Else we're running GLI, so we want the local Greenstone library server (if server.exe exists, otherwise it will be webLib)
     374    if exist "%GSDLHOME%\server.exe" goto localLib
    264375
    265376:webLib
    266     "%JAVAPATH%\java" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -gsdlos %GSDLOS% -perl %PERLPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9
    267 
    268     if ERRORLEVEL 2 goto webLib
    269 
     377    "%JAVA_EXECUTABLE%" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -gsdlos %GSDLOS% -perl %PERLPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9
     378    if ERRORLEVEL 2 if not "%localLibFailed%" == "true" (
     379        echo webLib failed, going to localLib
     380        set webLibFailed=true
     381        goto localLib
     382    )
     383    goto finRun
     384
     385:localLib
     386    "%JAVA_EXECUTABLE%" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -gsdlos %GSDLOS% -perl %PERLPATH% -local_library %GSDLHOME%\server.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
     387    if ERRORLEVEL 2 if not "%webLibFailed%" == "true" (
     388        echo localLib failed, going to webLib
     389        set localLibFailed=true
     390        goto webLib
     391    )
     392    goto finRun
     393
     394
     395:finRun
    270396    if "%GLILANG%" == "en" echo Done!
    271397    if "%GLILANG%" == "es" echo ­Hecho!
    … …  
    274400    goto done
    275401
    276 :localLib
    277     "%JAVAPATH%\java" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -gsdlos %GSDLOS% -perl %PERLPATH% -local_library %GSDLHOME%\server.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
    278 
    279     if ERRORLEVEL 2 goto localLib
    280 
    281     if "%GLILANG%" == "en" echo Done!
    282     if "%GLILANG%" == "es" echo ­Hecho!
    283     if "%GLILANG%" == "fr" echo Termin‚!
    284     if "%GLILANG%" == "ru" echo ‚믮«­¥­®!
    285     goto done
    286402
    287403:exit
    288404echo.
    289405pause
     406color 07
     407popd
    290408
    291409:done
    292410:: ---- Clean up ----
    293411set PERLPATH=
    294 set JAVAPATH=
     412set JAVA_EXECUTABLE=
     413color 07
     414popd
Note: See TracChangeset for help on using the changeset viewer.