Changeset 4335

Timestamp:

2003-05-26T16:25:32+12:00 (21 years ago)

Author:

jmt12

Message:

GLI now recognizes local library - John

File:

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

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

@@ -58 +58 @@
 import org.greenstone.gatherer.msm.MetadataSetManager;
 import org.greenstone.gatherer.util.ArrayTools;
+import org.greenstone.gatherer.util.GSDLSiteConfig;
 import org.greenstone.gatherer.util.Utility;
 import sun.misc.*;
@@ -99 +100 @@
      /** Extra environment information which must be set before shell processes will run properly. Should always be null if the startup script/program has done its job properly. */
      static public String extra_env[] = null;
+     private GSDLSiteConfig gsdlsite_cfg = null;
+     private ExternalApplication server = null;
      /** The name of the Gatherers configuration file. */
      static private String CONFIG_FILE_NAME = "gatherer.cfg";
@@ -168 +171 @@
                 dictionary = new Dictionary(config.getLocale("general.locale", true), config.getFont("general.font", true));
 
+                // If we were given a server run it if neccessary.
+                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.
-                
+
                 if(config.exec_file == null && config.exec_address == null) {
                      missingEXEC(dictionary);
@@ -176 +182 @@
                      missingGSDL(dictionary);
                 }
-                // Perl path is a little different as it is perfectly ok to start the Gatherer without providing a perl path 
+                // Perl path is a little different as it is perfectly ok to start the Gatherer without providing a perl path
                 boolean found_perl = false;
                 if(config.perl_path != null) {
@@ -301 +307 @@
                 config.setDimension("general.size", true, size);
           }
+
           // Save configuration.
           saveConfig();
@@ -314 +321 @@
           }
           if(apps.size() == 0) {
-                try {
-                     wait(200);
-                }
-                catch(Exception error) {
-                }
+                stopServerEXE();
+                //try {
+                //   wait(200);
+                //}
+                //catch(Exception error) {
+                //}
                 System.exit(0);
           }
@@ -444 +452 @@
               else if(args[i].equals("-library") && (i + 1) < args.length) {
                      exec_path = args[i+1];
+                     // 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("/")) {
+                          exec_path = exec_path + "library";
+                     }
               }
               else if(args[i].equals("-perl")) {
@@ -625 +637 @@
           try {
                 config = new Configuration(gsdl_path, exec_path, perl_path);
-          } 
+          }
           catch (Exception error) {
                 Gatherer.println("config.xml is not a well formed XML document.");
@@ -652 +664 @@
      }
 
+     private void startServerEXE() {
+          if(config.exec_file != null && config.exec_address == null && Utility.isWindows()) {
+                // 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.
+                          }
+                          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();
+                          }
+                     }
+                }
+                // Can't do a damb thing.
+          }
+     }
+
+    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);
+                    }
+                    gsdlsite_cfg.load();
+                }
+            }
+            catch (Exception error) {
+              error.printStackTrace();
+            }
+            // Restore the gsdlsite_cfg
+            if(gsdlsite_cfg != null) {
+                gsdlsite_cfg.restoreAutoEnter();
+            }
+        }
+    }
+
      /** This private class contains an instance of an external application running within a JVM shell. It is important that this process sits in its own thread, but its more important that when we exit the Gatherer we don't actually System.exit(0) the Gatherer object until the user has volunteerily ended all of these child processes. Otherwise when we quit the Gatherer any changes the users may have made in external programs will be lost and the child processes are automatically deallocated. */
      private class ExternalApplication
           extends Thread {
+          private Process process = null;
           /** The initial command string given to this sub-process. */
           private String command = null;
@@ -675 +755 @@
                      debug("Running " + command);
                      Runtime rt = Runtime.getRuntime();
-                     Process prcs = rt.exec(command);
-                     prcs.waitFor();
+                     process = rt.exec(command);
+                     process.waitFor();
                 }
                 catch (Exception error) {
@@ -685 +765 @@
                 // Call exit if we were the last outstanding child process thread.
                 if(apps.size() == 0 && exit == true) {
+                     stopServerEXE();
                      System.exit(0);
                 }
+          }
+          public void stopExternalApplication() {
+             if(process != null) {
+                process.destroy();
+             }
           }
      }