Changeset 31646 for main/trunk/gli/src/org/greenstone/gatherer/file

Timestamp:

2017-05-04T20:32:17+12:00 (7 years ago)

Author:

ak19

Message:

1. Moved isAvailable(program) into SafeProcess.java from FileAssociationManager.java. 2. SafeProcess.java now successfully terminates any child processes launched on Windows too because of the addition of new methods. But the real solution may need to be in Perl, especially if using mobile windows OS where the system tools currently being used may not be present. 4. Adding JNA jar files, jna.jar and jna-platform.jar of version 4.1.0 (2013), to gli's lib. These are needed to get the PID of a running process on Windows. 5. Need to tidy up code, need to check linux is not affected by platform specific import statements used by Windows, need to make the process termination recursive (not just children, but all descendants need to be killed on destroyProcess(p). Rather than wmic delete or taskkill or tskill, can use the linked Java code Processes.java which is dependent on JNA.

File:

• main/trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java

@@ -117 +117 @@
         String [] browsers = new String [] {"mozilla", "netscape", "firefox"};
         for (int i=0; i<browsers.length; i++) {
-        if (isAvailable(browsers[i])) {
+        if (SafeProcess.isAvailable(browsers[i])) {
             command = browsers[i]+ " %1";
             break;
@@ -351 +351 @@
     }
 
-
-    protected boolean isAvailable(String program) {
-    try {
-        // `which bla` does nothing, prompt is returned
-        // `which grep` returns a line of output with the path to grep
-        SafeProcess prcs = new SafeProcess("which " + program);
-        prcs.runProcess();
-        String output = prcs.getStdOutput();
-        if(output.equals("")) {
-        return false;
-        }
-        //System.err.println("*** 'which " + program + "' returned: " + output);
-        return true;
-    } catch (Exception exc) {
-        return false;
-    }
-    }
 }