Changeset 19758 for gli/trunk

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.

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (3 diffs)
• greenstone/LocalLibraryServer.java (modified) (5 diffs)
• gui/PreviewButton.java (modified) (1 diff)

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(); 
         }

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

@@ -162 +162 @@
     }
 
-    static public void start(String gsdl_path, String local_library_server_file_path)
+    static public boolean start(String gsdl_path, String local_library_server_file_path)
     {
-    // Check the local library server file (server.exe or gs2-server.sh) exists
-    local_library_server_file = new File(local_library_server_file_path);
-    
-    if (!local_library_server_file.exists()) {
-        DebugStream.println("No local library at given file path.");
-    
-        String defaultServerFilename = Utility.isWindows() ? "server.exe" : "gs2-server.sh";
-        local_library_server_file = new File(gsdl_path + defaultServerFilename);
-        if (!local_library_server_file.exists()) {
-        DebugStream.println("No local library at all.");
-        return;
-        }
-    }   
-
     // In the case of the Local Library Server on Linux, we need to do an extra test:
     // If GS2 was not configured with --enable-apache-httpd, then there is no apache webserver folder,
@@ -187 +173 @@
         DebugStream.println("The web server does not exist at " 
                     + localLinuxServerFolder.getAbsolutePath() + "\nNo local library at all. Trying web library");
-        return;
-        }
-    }
+        return false;
+        }
+    }
+
+    // Check the local library server file (server.exe or gs2-server.sh) exists
+    if(local_library_server_file_path == null) {
+        return false;
+    }
+    local_library_server_file = new File(local_library_server_file_path);   
+    if (!local_library_server_file.exists()) {
+        DebugStream.println("No local library at given file path.");
+    
+        String defaultServerFilename = Utility.isWindows() ? "server.exe" : "gs2-server.sh";
+        local_library_server_file = new File(gsdl_path + defaultServerFilename);
+        if (!local_library_server_file.exists()) {
+        DebugStream.println("No local library at all.");
+        return false;
+        }
+    }   
 
     llssite_cfg_file = new LLSSiteConfig(local_library_server_file);
-        
+    if(!llssite_cfg_file.isConfigFileSet()) {
+        return false;
+    }
+
+    // from now on return true: we're in local_library_mode (even if the server is not running)
+
+    
     // If the user launched the GSI independent of GLI, but user has not pressed
     // Enter Library yet, then we will obtain the previewURL later.
     if(LocalLibraryServer.isURLPending()) {
         // running is still false when the URL is pending because only GSI is running, not the server
-        return;
+        return true;
     } else if(llssite_cfg_file.isIndependentGSI()) {
         // there is a url, it's not pending, and it is llssite.cfg: meaning GSI has started up
         running = true;
-        return;     
+        return true;    
     }
 
@@ -219 +227 @@
         // Run the server interface
         Gatherer.spawnApplication(local_library_server_command, ID);
-        return;
+        return true;
         }
         catch (MalformedURLException exception) {
@@ -250 +258 @@
         }
     }
+
+    return true;
     }
 
@@ -584 +594 @@
         lastModified = configFile.lastModified();
         return true;
+    }
+
+    /** To test we've actually instantiated this object meaningfully. If so, then configFile is set */
+    public boolean isConfigFileSet() {
+        return (configFile != null && configFile.exists());
     }
     

gli/trunk/src/org/greenstone/gatherer/gui/PreviewButton.java

@@ -88 +88 @@
     }
 
-    if(!Gatherer.isGsdlRemote) {
+    if(Gatherer.isLocalLibrary) {
         // check that the local library server is still running  - doesn't do anything if it's not supposed to be running
         // !! Don't like this here
         LocalLibraryServer.checkServerRunning();
-        if(LocalLibraryServer.isRunning() && LocalLibraryServer.isURLPending()) {
+        if(LocalLibraryServer.isURLPending()) {
         // Remind the user to press Enter Library, and return from this method
         JOptionPane.showMessageDialog(Gatherer.g_man,