Changeset 24709

Timestamp:

2011-10-03T15:48:21+13:00 (13 years ago)

Author:

ak19

Message:

If on Windows and using the Start command to launch a file from GLI using its file association command, there may be spaces in the file path. In that case, need to launch the command slightly differently because the arguments to running a Java Process in this case are passed in as array. In this case, the start and its own arguments are all to be one element of that array.

File:

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

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

@@ -162 +162 @@
     }
    
-    public String [] getCommand(File file) {
+    public String [] getCommand(File file) {    
     String command = null;
     String [] commands = null;
@@ -218 +218 @@
         }
 
-        if (command != null && !command.equals("")) {
+        if (command != null && !command.equals("")) {       
+        
         // Make the command into a string []        
         commands = command.split(" ");
@@ -228 +229 @@
         // We have to fix filename under windows to escape the backslashes
         filename = filename.replaceAll(ESCAPE, ESCAPED_ESCAPE);
+        
+        // dealing with spaces in filepath when using start command
+        if(Utility.isWindows() && filename.indexOf(" ") != -1 && command.indexOf("start") != -1) { 
+            // On Windows, start command used spaces in filepath. In this case:
+            // start and its arguments all together need to go into one element of the commands array
+            // otherwise <cmd /c start "window title" "%1"> does not work if there are spaces in the
+            // file path %1, when running the Process with a command array.
+            
+            // Need <"start \"window\" \"%1\""> to be an element in the command array:
+            String[] tmp = commands;
+            int index = 0;
+            
+            for(int i = 0; i < commands.length; i++) {
+                if(commands[i].indexOf("start") != -1) {
+                    index = i;
+                }
+            }
+            
+            commands = new String[index+1];
+            for(int i = 0; i < index; i++) {
+                commands[i] = tmp[i];
+            }
+            
+            commands[index] = tmp[index];
+            for(int i = index+1; i < tmp.length; i++) {
+                commands[index] = commands[index] + " " + tmp[i];
+            }
+            
+        }
 
         for (int i=0; i<commands.length; i++) {