Changeset 7739 for trunk/gli/src/org/greenstone/gatherer/shell

Timestamp:

2004-07-16T13:48:18+12:00 (20 years ago)

Author:

davidb

Message:

General restructuring to allow GLI to be run as an applet.
Main area of change: making code look in the JAR file first
for a file rather than assume on local file system.
Stores data locally on system in '.gli' or Greenstone/GLI
folder in users home space for subsequent uses of applet.

File:

• trunk/gli/src/org/greenstone/gatherer/shell/GShell.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -38 +38 @@
 
 import java.io.*;
+import java.net.*;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import javax.swing.*;
 import javax.swing.event.*;
@@ -48 +50 @@
 import org.greenstone.gatherer.shell.GShellListener;
 import org.greenstone.gatherer.shell.GShellProgressMonitor;
+import org.greenstone.gatherer.util.StaticStrings; 
+import org.greenstone.gatherer.util.Utility;
 
 /** The <strong>GShell</strong> is reponsible for running a separately threaded process in the command shell. This is necessary for executing the Perl Scripts and also for other system related funcitonality.
@@ -103 +107 @@
     static public boolean processRunning(Process process) {
     boolean process_running = false;
+
     try {
         process.exitValue(); // This will throw an exception if the process hasn't ended yet.
@@ -149 +154 @@
        } */
 
+
+
+    protected boolean got_stream_char(InputStreamReader isr, StringBuffer line_buffer,
+                      BufferedOutputStream bos) throws IOException 
+    {
+    // Hopefully this doesn't block if the process is trying to write to STDOUT/STDERR.
+
+    boolean input_status = false;
+
+    if(isr.ready()) {
+        input_status = true;
+        int c = isr.read();
+        if(c == '\n' || c == '\r') {
+        if(line_buffer.length() > 0) {
+            String line = line_buffer.toString();
+            Gatherer.println("* " + line + " *");
+            fireMessage(type, typeAsString(type) + "> " + line, status, bos);
+            line = null;
+            line_buffer = new StringBuffer();
+        }
+        }
+        else {
+        line_buffer.append((char)c);
+        }
+    }
+
+    return input_status;
+    }
+
+
+    protected StringBuffer get_stream_char(InputStreamReader isr, StringBuffer line_buffer,
+                   BufferedOutputStream bos) throws IOException 
+    {
+    int c = isr.read();
+    ///atherer.println("isr: '" + (char) c + "'");
+    if(c == '\n' || c == '\r') {
+        if(line_buffer.length() > 0) {
+        String line = line_buffer.toString();
+        // Gatherer.println("* " + line + " *");
+        fireMessage(type, typeAsString(type) + "> " + line, status, bos);
+        line_buffer = new StringBuffer();
+        }
+    }
+    else {
+        line_buffer.append((char)c);
+    }
+
+    return line_buffer;
+    }
+
+    protected void runRemote(String[] args, BufferedOutputStream bos) 
+    {
+    try {
+
+        String perl_cmd = args[0];
+        int perl_cmd_root = perl_cmd.lastIndexOf(File.separator);
+        
+        if (perl_cmd_root > 0) {
+        String perl_cmd_cut = perl_cmd.substring(perl_cmd_root+1);
+        perl_cmd = perl_cmd_cut;
+        }
+
+        String launch  = Gatherer.cgiBase + "launch";
+        launch = launch + "?cmd=" + perl_cmd;
+
+        for(int i = 1; i<args.length; i++) {
+            
+        String arg = args[i];
+
+        if (arg.equals("-collectdir") || arg.equals("-importdir")
+            || arg.equals("-builddir")) {
+            // skip it
+            i++;
+            continue;
+        }
+        
+        launch += "&";
+        
+        if(arg.startsWith(StaticStrings.MINUS_CHARACTER)) {
+            String name = arg.substring(1);
+            launch = launch + name + "=";
+            if (i+1<args.length-1) {
+            if (!args[i+1].startsWith(StaticStrings.MINUS_CHARACTER)) {
+                i++;
+                String val = args[i];
+                launch = launch + val;
+            }
+            }
+        }
+        else {
+            launch = launch + "c=" + arg;
+        }
+        }
+
+        System.err.println("**** launch url = " + launch);
+
+        URL launch_url = new URL(launch);
+        URLConnection launch_connection = launch_url.openConnection();
+        InputStream stdis = launch_connection.getInputStream();
+        InputStreamReader stdisr = new InputStreamReader(stdis, "UTF-8"  );
+    
+        BufferedReader stdbr = new BufferedReader(stdisr);
+    
+        if (type == GShell.NEW) {
+        while(true) {
+            String line = stdbr.readLine();
+            if (line == null) { break; }
+        }       
+        }
+        else {
+        while(!hasSignalledStop()) {
+            String line = stdbr.readLine();
+            if (line == null) { break; }
+            fireMessage(type, typeAsString(type) + "> " + line, status, bos);
+        }       
+        }
+        stdbr.close();
+    
+        status = OK;
+        fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Success"), status, null);
+    }
+    // Exception
+    catch (Exception exception) {
+        Gatherer.println("Exception in GShell.runRemove() - unexpected");
+        Gatherer.printStackTrace(exception);
+        status = ERROR;
+    }
+    }
+
+
+    protected void runLocal(String[] args, BufferedOutputStream bos) 
+    {
+    try {
+        String command = "";
+        for(int i = 0; i < args.length; i++) {
+        command = command + args[i] + " ";
+        }
+        
+        Gatherer.println("Command: "+command);
+        ///ystem.err.println("Command: " + command);
+        fireMessage(type, Dictionary.get("GShell.Command") + ": " + command, status, null);
+        
+        Runtime rt = Runtime.getRuntime();
+        Process prcs = rt.exec(args);
+        
+        InputStreamReader eisr = new InputStreamReader( prcs.getErrorStream(), "UTF-8" );
+        InputStreamReader stdisr = new InputStreamReader( prcs.getInputStream(), "UTF-8"  );
+        //BufferedReader ebr = new BufferedReader( eisr );
+        //BufferedReader stdinbr = new BufferedReader( stdinisr );
+        // Captures the std err of a program and pipes it into std in of java
+    
+        StringBuffer eline_buffer = new StringBuffer();
+        StringBuffer stdline_buffer = new StringBuffer();
+    
+        while(type != GShell.NEW && processRunning(prcs) && !hasSignalledStop()) {
+        // Hopefully this doesn't block if the process is trying to write to STDOUT.
+        if((eisr!=null) && eisr.ready()) { 
+            eline_buffer = get_stream_char(eisr,eline_buffer,bos);
+        }
+        // Hopefully this won't block if the process is trying to write to STDERR
+        else if(stdisr.ready()) {
+            stdline_buffer = get_stream_char(stdisr,stdline_buffer,bos);
+        }
+        else {
+            try {
+            sleep(100);
+            }
+            catch(Exception exception) {
+            }
+        }
+        }
+    
+        if(!hasSignalledStop()) {
+        // Of course, just because the process is finished doesn't
+        // mean the incoming streams are empty. Unfortunately I've
+        // got no chance of preserving order, so I'll process the
+        // error stream first, then the out stream
+        while(eisr.ready()) {
+            eline_buffer = get_stream_char(eisr,eline_buffer,bos);
+        }
+        
+        while(stdisr.ready()) {
+            stdline_buffer = get_stream_char(stdisr,stdline_buffer,bos);
+        }
+        
+        // Ensure that any messages still remaining in the string buffers are fired off.
+        if(eline_buffer.length() > 0) {
+            String eline = eline_buffer.toString();
+            //Gatherer.println("Last bit of eline: " + eline);
+            fireMessage(type, typeAsString(type) + "> " + eline, status, bos);
+            eline = null;
+        }
+        
+        if(stdline_buffer.length() > 0) {
+            String stdline = stdline_buffer.toString();
+            //Gatherer.println("Last bit of stdline: " + stdline);
+            fireMessage(type, typeAsString(type) + "> " + stdline, status, null);
+            stdline = null;
+        }
+        }
+        else {
+        System.err.println("We've been asked to stop.");
+        }
+    
+    
+        if(!hasSignalledStop()) {
+        // Now display final message based on exit value
+        
+        prcs.waitFor(); 
+
+        if(prcs.exitValue() == 0) {
+            status = OK;
+            fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Success"), status, null);
+        }
+        else {
+            status = ERROR;
+            fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Failure"), status, null);
+        }
+        
+        eisr.close();
+        stdisr.close();
+        }
+        else {
+        // I need to somehow kill the child process. Unfortunately
+        // Thread.stop() and Process.destroy() both fail to do
+        // this. But now, thankx to the magic of Michaels 'close the
+        // stream suggestion', it works fine (no it doesn't!)
+        prcs.getInputStream().close();
+        prcs.getErrorStream().close();
+        prcs.getOutputStream().close();
+        prcs.destroy();
+        status = CANCELLED;
+        }
+    }
+    // Exception
+    catch (Exception exception) {
+        Gatherer.println("Exception in GShell.runLocal() - unexpected");
+        Gatherer.printStackTrace(exception);
+        status = ERROR;
+    }
+    }
+    
+    
+
     /** Any threaded class must include this method to allow the thread body to be run. */
     public void run() {
+
+    String col_name = args[args.length-1];      
+
     // Determine if the user has asked for an outfile.
     String out_name = null;
@@ -170 +422 @@
         }
     }
+
+    if (Gatherer.isGsdlRemote) {
+        if (type == IMPORT) {
+        // zip up import folder
+        Utility.zipup(col_name,"import");
+        // upload it to gsdl server
+        Utility.upload_url_zip(col_name,"import");
+
+        // upload etc/collect.cfg to server
+        Utility.zipup(col_name,Utility.CONFIG_FILE);
+        Utility.upload_url_zip(col_name,"etc");
+        }
+    }
+
+
     // Issue a processBegun event
     fireProcessBegun(type, status);
-    try {
-        String command = "";
-        for(int i = 0; i < args.length; i++) {
-        command = command + args[i] + " ";
-        }
-        Gatherer.println("Command: "+command);
-        ///ystem.err.println("Command: " + command);
-        fireMessage(type, Dictionary.get("GShell.Command") + ": " + command, status, null);
-        
-        Runtime rt = Runtime.getRuntime();
-        Process prcs = rt.exec(args);
-        InputStreamReader eisr = new InputStreamReader( prcs.getErrorStream(), "UTF-8" );
-        InputStreamReader stdisr = new InputStreamReader( prcs.getInputStream(), "UTF-8"  );
-        //BufferedReader ebr = new BufferedReader( eisr );
-        //BufferedReader stdinbr = new BufferedReader( stdinisr );
-        // Captures the std err of a program and pipes it into std in of java
-        
-        StringBuffer eline_buffer = new StringBuffer();
-        StringBuffer stdline_buffer = new StringBuffer();
-        while(type != GShell.NEW && processRunning(prcs) && !hasSignalledStop()) {
-        // Hopefully this doesn't block if the process is trying to write to STDOUT.
-        if(eisr.ready()) {
-            int c = eisr.read();
-            ///atherer.println("eisr: '" + (char) c + "'");
-            if(c == '\n' || c == '\r') {
-            if(eline_buffer.length() > 0) {
-                String eline = eline_buffer.toString();
-                ///atherer.println("* " + eline + " *");
-                fireMessage(type, typeAsString(type) + "> " + eline, status, bos);
-                eline = null;
-                eline_buffer = new StringBuffer();
-            }
-            }
-            else {
-            eline_buffer.append((char)c);
-            }
-        }
-        // Hopefully this won't block if the process is trying to write to STDERR
-        else if(stdisr.ready()) {
-            int c = stdisr.read();
-            ///atherer.println("eisr: '" + (char) c + "'");
-            if(c == '\n' || c == '\r') {
-            if(stdline_buffer.length() > 0) {
-                String stdline = stdline_buffer.toString();
-                ///atherer.println("+ " + stdline + " +");
-                fireMessage(type, typeAsString(type) + "> " + stdline, status, null);
-                stdline = null;
-                stdline_buffer = new StringBuffer();
-            }
-            }
-            else {
-            stdline_buffer.append((char)c);
-            }
-        }
-        else {
-            try {
-            sleep(100);
-            }
-            catch(Exception exception) {
-            }
-        }
-        }
-        if(!hasSignalledStop()) {
-        // Of course, just because the process is finished doesn't mean the incoming streams are empty. Unfortunately I've got no chance of preserving order, so I'll process the error stream first, then the out stream
-        while(eisr.ready()) {
-            int c = eisr.read();
-            ///atherer.println("eisr: '" + (char) c + "'");
-            if(c == '\n' || c == '\r') {
-            if(eline_buffer.length() > 0) {
-                String eline = eline_buffer.toString();
-                ///atherer.println("* " + eline + " *");
-                fireMessage(type, typeAsString(type) + "> " + eline, status, bos);
-                eline = null;
-                eline_buffer = new StringBuffer();
-            }
-            }
-            else {
-            eline_buffer.append((char)c);
-            }
-        }
-        while(stdisr.ready()) {
-            int c = stdisr.read();
-            ///atherer.println("eisr: '" + (char) c + "'");
-            if(c == '\n' || c == '\r') {
-            if(stdline_buffer.length() > 0) {
-                String stdline = stdline_buffer.toString();
-                ///atherer.println("+ " + stdline + " +");
-                fireMessage(type, typeAsString(type) + "> " + stdline, status, null);
-                stdline = null;
-                stdline_buffer = new StringBuffer();
-            }
-            }
-            else {
-            stdline_buffer.append((char)c);
-            }
-        }
+    if (Gatherer.isGsdlRemote) {
+        runRemote(args,bos);
+    }
+    else {
+        runLocal(args,bos);
+    }
+
+    if(status == OK) {
+        if (type == NEW) {
+        if (Gatherer.isGsdlRemote) {
+            Utility.download_url_zip(col_name,".");
+            Utility.unzip(col_name);
+        }
+        }
+        else if(type == IMPORT) {
         
-        // Ensure that any messages still remaining in the string buffers are fired off.
-        if(eline_buffer.length() > 0) {
-            String eline = eline_buffer.toString();
-            ///atherer.println("Last bit of eline: " + eline);
-            fireMessage(type, typeAsString(type) + "> " + eline, status, bos);
-            eline = null;
-        }
+        // download the archives directory (if gsdl server is remote)           
+        if (Gatherer.isGsdlRemote) {
+            Utility.delete(Gatherer.c_man.getCollectionArchive()); // remove current archives
+            Utility.download_url_zip(col_name,"archives");
+            Utility.unzip(col_name);
+        }
+
+        // extract any new metadata from the archive directory.
+        fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Start"), status, null);
+        new GreenstoneArchiveParser(progress, this);
+        fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Complete"), status, null);
+        }
+
+        else if(type == BUILD) {
         
-        if(stdline_buffer.length() > 0) {
-            String stdline = stdline_buffer.toString();
-            ///atherer.println("Last bit of stdline: " + stdline);
-            fireMessage(type, typeAsString(type) + "> " + stdline, status, null);
-            stdline = null;
-        }
-        }
-        else {
-        System.err.println("We've been asked to stop.");
-        }
-        
-        if(!hasSignalledStop()) {
-        // Now display final message based on exit value
-        prcs.waitFor();
-        
-        if(prcs.exitValue() == 0) {
-            status = OK;
-            fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Success"), status, null);
-        }
-        else {
-            status = ERROR;
-            fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Failure"), status, null);
-        }
-        }
-        else {
-        // I need to somehow kill the child process. Unfortunately Thread.stop() and Process.destroy() both fail to do this. But now, thankx to the magic of Michaels 'close the stream suggestion', it works fine (no it doesn't!)
-        prcs.getInputStream().close();
-        prcs.getErrorStream().close();
-        prcs.getOutputStream().close();
-        prcs.destroy();
-        status = CANCELLED;
-        }
-    }
-    // Exception
-    catch (Exception exception) {
-        Gatherer.println("Exception in GShell.run() - unexpected");
-        Gatherer.printStackTrace(exception);
-        status = ERROR;
-    }
-    // If no error occured, and this was an import process we now extract any new metadata from the archive directory.
-    if(status == OK && type == IMPORT) {
-        fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Start"), status, null);
-        new GreenstoneArchiveParser(progress, this);
-        fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Complete"), status, null);
-    }
+        // download the building directory (if gsdl server is remote)           
+        if (Gatherer.isGsdlRemote) {
+            Utility.delete(Gatherer.c_man.getCollectionBuild()); // remove current build dir
+            Utility.download_url_zip(col_name,"building");
+            Utility.unzip(col_name);
+        }
+
+        }
+    }
+
     if(hasSignalledStop()) {
         status = CANCELLED;