Changeset 15154 for gli

Timestamp:

2008-03-29T18:10:09+13:00 (16 years ago)

Author:

ak19

Message:

runLocal() method now uniformly executes a process with arguments instead of a single string composed of the multiple arguments. Spaces in filepaths are preserved. But this required a change to how mkcol.pl was executed from CollectionManager.java

File:

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

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

@@ -227 +227 @@
     private void runLocal(String[] args, BufferedOutputStream bos) 
     {
-    boolean execArgs = false;
     try {
         String command = "";
-        for(int i = 0; i < args.length && !execArgs; i++) {
-        if(args[i].indexOf(' ') != -1) { // if any argument contains spaces, then we'll have to
-           execArgs = true; // execute it with argument array rather than command item
-        }
+        for(int i = 0; i < args.length; i++) {
         command = command + args[i] + " ";
         }
@@ -242 +238 @@
         Runtime rt = Runtime.getRuntime();
         Process prcs = null;
-        if (Utility.isWindows() || execArgs){ // if execArgs=true, then we're on Linux and one or more arguments 
-        // contained spaces, meaning we'll have to execute it with an argument array rather than command item.
-        // This is especially necessary if one of the args is a filepath containing spaces in the filename or path
-        prcs = rt.exec(args);
-        } else { // we're on Linux and none of the arguments contains any spaces,
-        // so just execute with single string argument (command)
-        prcs = rt.exec(command);
-        }
-                    
+      
+        prcs = rt.exec(args);
+        // If we used single argument exec, spaces in filenames or paths cause problems
+        // I.e. better to avoid: prcs = rt.exec(command);
+        
         InputStreamReader eisr = new InputStreamReader( prcs.getErrorStream(), "UTF-8" );
         InputStreamReader stdisr = new InputStreamReader( prcs.getInputStream(), "UTF-8"  );        
@@ -270 +262 @@
             sleep(100);
             }
-            catch(Exception exception) {
+            catch(Exception exception) {         
             }
         }