Changeset 6313 for trunk/gli

Timestamp:

2003-12-19T11:36:51+13:00 (20 years ago)

Author:

kjdon

Message:

changed looking in registry to teh start command for windows when there is no file association

File:

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

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

@@ -109 +109 @@
         // we use cmd and start
         if (Utility.isWindows9x()) {
-        command = "command.com /c start \""+url+"\"";
+        command = StaticStrings.WIN_9X_OPEN_COMMAND;//"command.com /c start \""+url+"\"";
         } else {
-        command = "cmd.exe /c start \"\" \""+url+"\"";
-        }
+        command = StaticStrings.WIN_OPEN_COMMAND;//"cmd.exe /c start \"\" \""+url+"\"";
+        }
+        command = command.replaceAll(FILENAME_ARG, url);
         return command;
     }
@@ -180 +181 @@
         if(Utility.isWindows()) {
             ///ystem.err.println("Is Windows");
-            command = WinRegistry.openCommand(filename);
-        }
+            //command = WinRegistry.openCommand(filename);
+            //try the start command
+            if (Utility.isWindows9x()) {
+            command = StaticStrings.WIN_9X_OPEN_COMMAND;
+            } else {
+            command = StaticStrings.WIN_OPEN_COMMAND;
+            }
+            
+        }
+        
         // If we are on a mac, default to using the open program
         else if(Utility.isMac()) {