Changeset 10642

Timestamp:

2005-09-26T14:49:03+12:00 (18 years ago)

Author:

kjdon

Message:

added a new method to LocalLIbraryServer to check that the server.exe is actually running, and restart it if not, and call this when click preview button, so that if local library is down, then it gets restarted.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• LocalLibraryServer.java (modified) (4 diffs)
• gui/CreatePane.java (modified) (2 diffs)

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

@@ -42 +42 @@
 
     static private GSDLSiteConfig gsdlsite_cfg_file = null;
+    static private File local_library_server_file = null;
+
     static private boolean running = false;
-
 
     static public void addCollection(String collection_name)
@@ -86 +87 @@
     }
 
-
     static public void releaseCollection(String collection_name)
     {
@@ -98 +98 @@
     {
     // Check the local library server.exe file exists
-    File local_library_server_file = new File(local_library_server_file_path);
+    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.");
@@ -223 +223 @@
     running = false;
     }
-
-
+    
+    static public void checkServerRunning() {
+    gsdlsite_cfg_file.load();
+    if (gsdlsite_cfg_file.getURL() == null) {
+        // need to restart the server again
+        gsdlsite_cfg_file.set();
+
+        // Spawn local library server process
+        String local_library_server_command = local_library_server_file.getAbsolutePath() + " " + gsdlsite_cfg_file.getSiteConfigFilename();
+        Gatherer.spawnApplication(local_library_server_command);
+
+    }
+    }
     static private class OneSecondWait
     {

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

@@ -48 +48 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.LocalLibraryServer;
 import org.greenstone.gatherer.cdm.SearchTypeManager;
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
@@ -799 +800 @@
         Gatherer.c_man.getCollection().cdm.save(); // save the config file just in case
         configureHomeURL();
+        if (LocalLibraryServer.isRunning()) {
+        // if we are using the local library (isRunning is true), we need to make sure it is actually running
+        LocalLibraryServer.checkServerRunning();
+        }
         Gatherer.spawnBrowser(homepage);