Changeset 19758 for gli/trunk/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2009-06-08T15:16:34+12:00 (15 years ago)

Author:

ak19

Message:

Created new variable in Gatherer.java called isLocalLibrary that defaults to false and gets initialised upon calling LocalLibraryServer.start(). This variable is now also used in PreviewButton.java so that the Local Library Server is still working with a GSI interface launched either via GLI or independently, and still works with an external apache-web server.

File:

• gli/trunk/src/org/greenstone/gatherer/Gatherer.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/Gatherer.java

@@ -121 +121 @@
     static public boolean isApplet = false;
     static public boolean isGsdlRemote = false;
+    static public boolean isLocalLibrary = false;
 
     /* TODO: If we're using local GLI, collections are built locally. If we're using client-GLI
@@ -349 +350 @@
         }
         else { // local greenstone: Start up the local library server, if that's what we want
-        if (local_library_path != null && !GS3) {
-            LocalLibraryServer.start(gsdl_path, local_library_path);
-        }
+        if (!GS3) {
+            isLocalLibrary = LocalLibraryServer.start(gsdl_path, local_library_path);
+        }
+        // else web library: GS server is local, but doesn't use the webserver included with GS2
         }
         
@@ -369 +371 @@
         // It is not necessary if an independent GSI was launched and the user hasn't pressed Enter Library yet
         DebugStream.println("Configuration.library_url = " + Configuration.library_url);
-        if (Configuration.library_url == null && (LocalLibraryServer.isRunning() && !LocalLibraryServer.isURLPending())) {
+        if (Configuration.library_url == null && (isLocalLibrary && !LocalLibraryServer.isURLPending())) {
         missingEXEC(); 
         }