Changeset 6795

Timestamp:

2004-02-12T17:05:28+13:00 (20 years ago)

Author:

kjdon

Message:

made the getCommand method return String[] instead of String in case there are spaces in the filename

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• file/FileAssociationManager.java (modified) (4 diffs)

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

@@ -449 +449 @@
      */
     public void spawnApplication(File file) {
-    String command = assoc_man.getCommand(file);
-    if(command != null) {
-        ExternalApplication app = new ExternalApplication(command);
+    String [] commands = assoc_man.getCommand(file);
+    if(commands != null) {
+        ExternalApplication app = new ExternalApplication(commands);
         apps.add(app);
         app.start();

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

@@ -45 +45 @@
     static final private String ESCAPE = "\\\\"; // '\'
     static final private String ESCAPED_ESCAPE = "\\\\\\\\"; // '\\'
+    static final private String SPACE = " ";
+    static final private String ESCAPED_SPACE = "\\\\ ";
     private Element associations_element;
     private File data_file;   
@@ -165 +167 @@
     }
    
-    public String getCommand(File file) {
+    public String [] getCommand(File file) {
     String command = null;
+    String [] commands = null;
     if(file.isFile()) {
         // Determine extension
@@ -220 +223 @@
         }
         if(command != null) {
+        // Make the command into a string [] just in case the filename has spaces in it
+        commands = command.split(" ");
+        
         // We have to fix filename under windows to escape the backslashes.
         filename = filename.replaceAll(ESCAPE, ESCAPED_ESCAPE);
         // Replace %1 with the appropriate filename
-        command = command.replaceAll(FILENAME_ARG, filename);
+        for(int i=0; i<commands.length; i++) {
+            if (commands[i].equals(FILENAME_ARG)) {
+            commands[i] = filename;
+            }
+        }
+        //command = command.replaceAll(FILENAME_ARG, filename);
         }
         
@@ -230 +241 @@
         filename = null;
     }
-    return command;
+    return commands;
     }