Changeset 4349

Timestamp:

2003-05-27T15:16:46+12:00 (21 years ago)

Author:

jmt12

Message:

Bug fix to prevent GLI exit leaving GSDLSite.cfg in an inconsistant state - John

File:

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

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

@@ -172 +172 @@
 
                 // If we were given a server run it if neccessary.
-                startServerEXE();
+                if(config.exec_file != null) {
+                     startServerEXE();
+                }
 
                 // Having loaded the configuration (necessary to determine if certain warnings have been disabled) and dictionary, we now check if the necessary path variables have been provided.
@@ -320 +322 @@
                 }
           }
+
+          // If we started a server, we should try to stop it.
+          if(gsdlsite_cfg != null) {
+                stopServerEXE();
+          }
+
           if(apps.size() == 0) {
-                stopServerEXE();
-                //try {
-                //   wait(200);
-                //}
-                //catch(Exception error) {
-                //}
                 System.exit(0);
           }
@@ -452 +454 @@
               else if(args[i].equals("-library") && (i + 1) < args.length) {
                      exec_path = args[i+1];
+                     // If we are on a non-windows system, and thus the local server is unavailable, we can append http:// if no protocol found.
+                     if(exec_path.lastIndexOf(":", 5) == -1) {
+                          exec_path = "http://" + exec_path;
+                     }
                      // If the user has given us an address, but it ends with a '/' we assume we're using the greenstone library.cgi
-                     if(exec_path.endsWith("/")) {
+                     if(exec_path.startsWith("http://") && exec_path.endsWith("/")) {
                           exec_path = exec_path + "library";
                      }
@@ -668 +674 @@
                 // First of all we create a GSDLSiteCFG object and check if a URL is already present, in which case the server is already running.
                 gsdlsite_cfg = new GSDLSiteConfig(config.exec_file);
-                if(gsdlsite_cfg.exists()) {
-                     String url = gsdlsite_cfg.getURL();
-                     // If its already running then set exec address.
-                     if(url != null) {
-                          try {
-                                config.exec_address = new URL(url);
-                                gsdlsite_cfg = null; // Don't need this anymore.
+                String url = gsdlsite_cfg.getURL();
+                // If its already running then set exec address.
+                if(url != null) {
+                     try {
+                          config.exec_address = new URL(url);
+                     }
+                     catch(Exception error) {
+                     }
+                }
+                // Otherwise its time to run the server in a spawned process.
+                if(config.exec_address == null && config.exec_file.exists()) {
+                     // Configure for immediate entry. Note that this only works if the gsdlsite.cfg file exists.
+                     gsdlsite_cfg.set();
+                     // Spawn server
+                     server = new ExternalApplication(config.exec_file.getAbsolutePath());
+                     server.start();
+                     // Now we have to wait until program has started. We do this by reloading and checking
+                     try {
+                          gsdlsite_cfg.load();
+                          while((url = gsdlsite_cfg.getURL()) == null) {
+                                synchronized(this) {
+                                     wait(1000);
+                                }
+                                gsdlsite_cfg.load();
                           }
-                          catch(Exception error) {
-                          }
-                     }
-                     // Otherwise its time to run the server in a spawned process.
-                     if(config.exec_address == null) {
-                          // Configure for immediate entry.
-                          gsdlsite_cfg.setAutoEnter();
-                          // Spawn server
-                          server = new ExternalApplication(config.exec_file.getAbsolutePath());
-                          apps.add(server);
-                          server.start();
-                          // Now we have to wait until program has started. We do this by reloading and checking
-                          try {
-                                gsdlsite_cfg.load();
-                                while((url = gsdlsite_cfg.getURL()) == null) {
-                                    synchronized(this) {
-                                        wait(1000);
-                                    }
-                                     gsdlsite_cfg.load();
-                                }
-                                // Ta-da. Now the url should be available.
-                                config.exec_address = new URL(url);
-                          }
-                          catch (Exception error) {
-                              error.printStackTrace();
-                          }
+                          // Ta-da. Now the url should be available.
+                          config.exec_address = new URL(url);
+                     }
+                     catch (Exception error) {
+                          error.printStackTrace();
                      }
                 }
                 // Can't do a damb thing.
           }
+          System.err.println("Having started server.exe, exec_address is: " + config.exec_address);
      }
 
     private void stopServerEXE() {
-        // If we started the local library server, then kill it.
-        if(server != null) {
-            // Wait until it exits.
-            try {
-                gsdlsite_cfg.load();
-                while(gsdlsite_cfg.getURL() != null) {
-                    synchronized(this) {
-                        wait(1000);
+         // See if its already exited for some reason.
+         gsdlsite_cfg.load();
+         if(gsdlsite_cfg.getURL() != null) {
+              // Send the command for it to exit.
+              //Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.QUIT_COMMAND);
+              // Wait until it exits.
+              try {
+                    gsdlsite_cfg.load();
+                    while(gsdlsite_cfg.getURL() != null) {
+                         synchronized(this) {
+                              wait(1000);
+                         }
+                         gsdlsite_cfg.load();
                     }
-                    gsdlsite_cfg.load();
-                }
-            }
-            catch (Exception error) {
-              error.printStackTrace();
-            }
-            // Restore the gsdlsite_cfg
-            if(gsdlsite_cfg != null) {
-                gsdlsite_cfg.restoreAutoEnter();
-            }
-        }
+              }
+              catch (Exception error) {
+                    error.printStackTrace();
+              }
+         }
+         // Restore the gsdlsite_cfg
+         if(gsdlsite_cfg != null) {
+              gsdlsite_cfg.restore();
+         }
+         gsdlsite_cfg = null;
     }