Changeset 5895

Timestamp:

2003-11-19T14:15:23+13:00 (20 years ago)

Author:

kjdon

Message:

made a new BrowserApplication class to launch teh browser, added the configServer method from the preview pane into this class - uses calpane but should do http itself

File:

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

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

@@ -34 +34 @@
  **************************************************************************************/
 
+import calpa.html.*;
 import com.l2fprod.gui.*;
 import com.l2fprod.gui.plaf.skin.*;
@@ -123 +124 @@
     private GSDLSiteConfig gsdlsite_cfg = null;
     private ExternalApplication server = null;
+    private CalHTMLPane view   = null;
+
     /** The name of the Gatherers configuration file. */
     static private String CONFIG_FILE_NAME = "gatherer.cfg";
@@ -285 +288 @@
         g_man.display();
 
+        // set up the calpane to use for config server
+        CalHTMLPreferences prefs = new CalHTMLPreferences();
+        DefaultCalHTMLObserver observer = new DefaultCalHTMLObserver();
+        view = new CalHTMLPane(prefs, observer, "Default");
+
         // Place the window in the desired location on the screen, if this is do-able (not under most linux window managers apparently. In fact you're lucky if they listen to any of your screen size requests).
         g_man.setLocation(bounds.x, bounds.y);
@@ -371 +379 @@
     }
 
+    // used to send new coll messages to the local library
+    public void configServer(String command) {
+
+    try {
+        String url = config.exec_address.toString() + command;
+        ///ystem.err.println("Action: " + url);
+        view.setLoadSynchronously(true);
+        view.showHTMLDocument(new URL(url));
+        view.setLoadSynchronously(false);
+        ///ystem.err.println("Complete.");
+        url = null;
+    }
+    catch(Exception error) {
+        ///ystem.err.println("Bad URL.");
+    }
+
+    }
+
     /** Retrieve the metadata directory, as required by any MSMCaller implementation.
      * @return The currently active collection metadata directory as a <strong>String</strong>.
@@ -417 +443 @@
     }
     }
-
+    
+    public void spawnBrowser(String url) {
+    String command = assoc_man.getBrowserCommand(url);
+    if (command != null) {
+        BrowserApplication app = new BrowserApplication(command, url);
+        apps.add(app);
+        app.start();
+    }
+    else {
+        ///ystem.err.println("No browser command available."); 
+    }
+    }
+    
     /** The entry point into the Gatherer. Parses arguments.
      * @param args A collection of arguments that may include: initial screen size, dictionary, path to the GSDL etc.
@@ -791 +829 @@
         if(gsdlsite_cfg.getURL() != null) {
         // Send the command for it to exit.
-        Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.QUIT_COMMAND);
+        //Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.QUIT_COMMAND);
+        configServer(GSDLSiteConfig.QUIT_COMMAND);
         // Wait until it exits.
         try {
@@ -894 +933 @@
     }
     }
+    /** 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 BrowserApplication
+    extends Thread {
+    private Process process = null;
+    /** The initial command string given to this sub-process. */
+    private String command = null;
+    private String url = null;
+    private String[] commands = null;
+    /** Constructor.
+     * @param command The initial command <strong>String</strong>.
+     */
+//      public BrowserApplication(String command) {
+//          this.command = command;
+//      }
+
+    public BrowserApplication(String command, String url) {
+        StringTokenizer st = new StringTokenizer(command);
+        int num_tokens = st.countTokens();
+        this.commands = new String [num_tokens];
+        int i=0;
+        while (st.hasMoreTokens()) {
+        commands[i] = st.nextToken();
+        i++;
+        }
+        //this.commands = commands;
+        this.url = url;
+    }
+    /** We start the child process inside a new thread so it doesn't block the rest of Gatherer.
+     * @see java.lang.Exception
+     * @see java.lang.Process
+     * @see java.lang.Runtime
+     * @see java.lang.System
+     * @see java.util.Vector
+     */
+    public void run() {
+        // Call an external process using the args.
+        if(commands == null) {
+        apps.remove(this);
+        return;
+        }
+        try {
+        String prog_name = commands[0];
+        String lower_name = prog_name.toLowerCase();
+        if (lower_name.indexOf("mozilla") != -1 || lower_name.indexOf("netscape") != -1) { 
+            Gatherer.println("found mozilla or netscape, trying remote it");
+            // mozilla and netscape, try using a remote command to get things in the same window
+            String [] new_commands = new String[] {prog_name, "-raise", "-remote", "openURL("+url+")"};
+            printArray(new_commands);
+            Runtime rt = Runtime.getRuntime();
+            process = rt.exec(new_commands);
+            int exitCode = process.waitFor();
+            if (exitCode != 0) { // if Netscape or mozilla was not open
+            Gatherer.println("couldn't do remote, trying original command");
+            printArray(commands);
+            process = rt.exec(commands); // try the original command
+            }
+        } else {
+            // just run what we have been given
+            StringBuffer whole_command = new StringBuffer();
+            for(int i = 0; i < commands.length; i++) {
+            whole_command.append(commands[i]);
+            whole_command.append(" ");
+            }
+            println("Running " + whole_command.toString());
+            Runtime rt = Runtime.getRuntime();
+            process = rt.exec(commands);
+            process.waitFor();
+        }
+        }
+        
+        catch (Exception error) {
+        println("Error in BrowserApplication.run(): " + error);
+        printStackTrace(error);
+        }
+        // Remove ourself from Gatherer list of threads.
+        apps.remove(this);
+        // Call exit if we were the last outstanding child process thread.
+        if(apps.size() == 0 && exit == true) {
+        stopServerEXE();
+        System.exit(0);
+        }
+    }
+    public void printArray(String [] array) {
+        for(int i = 0; i < array.length; i++) {
+        System.err.println(array[i]+" ");
+        }
+    }
+    public void stopBrowserApplication() {
+        if(process != null) {
+        process.destroy();
+        }
+    }
+    }
 
     /** This class is intented to detect a specific SIGNAL, in this case SIGINT, and exit properly, rather than letting the Gatherer be interrupted which has the potential to leave erroneous lock files. */