Changeset 20479 for gli

Timestamp:

2009-09-02T13:19:52+12:00 (15 years ago)

Author:

ak19

Message:

Changes to deal with a local APACHE web server: gli.bat assumes WebLib mode only when it can't find either server.exe or gs2-server.bat. Also, it launches GLI with the path to the server.exe file if this exists or else with gs2-server.bat if in Local Library mode (else it defaults to Web Library mode).

File:

• gli/trunk/gli.bat (modified) (2 diffs)

gli/trunk/gli.bat

@@ -129 +129 @@
 :: if FLI is running, we don't want the local Greenstone library server running
 if "%PROGABBR%" == "FLI" goto webLib
-    :: Else we're running GLI, so we want the local Greenstone library server (if server.exe exists, otherwise it will be webLib)
-    if exist "%GSDLHOME%\server.exe" goto localLib 
+    :: Else we're running GLI, so we want the local Greenstone library server (if server.exe/gs2-server.bat exists, otherwise it will be webLib)
+    if not exist "%GSDLHOME%\server.exe" if not exist "%GSDLHOME%\gs2-server.bat" goto webLib 
+
+:localLib
+    if exist "%GSDLHOME%\server.exe" (
+    set locallib=%GSDLHOME%\server.exe
+    ) else (
+    set locallib=%GSDLHOME%\gs2-server.bat
+    )
+
+    "%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 "%locallib%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+    if ERRORLEVEL 2 (
+        goto localLib
+    )
+    goto finRun
 
 :webLib
@@ -137 +150 @@
         goto webLib
     )
-    goto finRun 
-
-:localLib
-    "%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
-    if ERRORLEVEL 2 (
-        goto localLib
-    )
     goto finRun
-
 
 :finRun