Changeset 5894

Timestamp:

2003-11-19T14:12:47+13:00 (20 years ago)

Author:

kjdon

Message:

added in getBrowserCommand - uses the file association stuff for linux. but should be removed from here I think.

File:

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

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

@@ -93 +93 @@
     }
 
+    public String getBrowserCommand(String url) {
+    String command = null;
+    if(Utility.isWindows()) {
+        // we use cmd and start
+        if (Utility.isWindows9x()) {
+        command = "command.com /c start \"\" \""+url+"\"";
+        } else {
+        command = "cmd.exe /c start \"\" \""+url+"\"";
+        }
+        return command;
+    }
+    // for now uder linux get the fileassoc thing. but eventually want a separate thing.
+    // pretend we are tyring to open an html file
+    String extension = "html";
+    Element entry = getCommand(extension);
+    if (entry != null) {
+        command = MSMUtils.getValue(entry); 
+    }
+    
+    if(command == null || command.length() == 0) {
+        FileAssociationDialog dialog = new FileAssociationDialog(this);
+        command = dialog.display(extension);
+        dialog = null;
+    }
+    if(command != null) {
+        // If no previous entry existed create one.
+        if(entry == null) {
+        entry = document.createElement(ENTRY_ELEMENT);
+        entry.setAttribute(EXTENSION_ATTRIBUTE, extension);
+        document.getDocumentElement().appendChild(entry);
+        }
+        // Replace the text in this node. Remember to replace the dummy filename with %1
+        MSMUtils.setValue(entry, command.replaceAll("temp.html", FILENAME_ARG));
+    }
+    
+    // if we haven't got a command by now, we'll never get one
+    if (command == null) return null;
+    // Replace %1 with the url in quotes
+    command = command.replaceAll(FILENAME_ARG, url);
+    return command;
+    }
+   
     public String getCommand(File file) {
     String command = null;
@@ -103 +145 @@
         if(entry != null) {
         command = MSMUtils.getValue(entry); 
+        }
+        if(command == null || command.length() == 0) {
+        // If command is null, and we are on windows try searching the registry.
+        if(Utility.isWindows()) {
+            command = WinRegistry.openCommand(filename);
+        }
+        // Otherwise display the dialog and ask the user to enter launching command.
         if(command == null || command.length() == 0) {
-            // If command is null, and we are on windows try searching the registry.
-            if(Utility.isWindows()) {
-            command = WinRegistry.openCommand(filename);
+            // Show the dialog which forces a user to select the launch command for a certain file.
+            FileAssociationDialog dialog = new FileAssociationDialog(this);
+            command = dialog.display(extension);
+            dialog = null;
+        }
+        // Hopefully by now we have a command, or else we're never going to get one. Add the association.
+        if(command != null) {
+            // If no previous entry existed create one.
+            if(entry == null) {
+            entry = document.createElement(ENTRY_ELEMENT);
+            entry.setAttribute(EXTENSION_ATTRIBUTE, extension);
+            document.getDocumentElement().appendChild(entry);
             }
-            // Otherwise display the dialog and ask the user to enter launching command.
-            if(command == null || command.length() == 0) {
-            // Show the dialog which forces a user to select the launch command for a certain file.
-            FileAssociationDialog dialog = new FileAssociationDialog(this);
-            command = dialog.display(extension);
-            dialog = null;
-            }
-            // Hopefully by now we have a command, or else we're never going to get one. Add the association.
-            if(command != null) {
-            // If no previous entry existed create one.
-            if(entry == null) {
-                entry = document.createElement(ENTRY_ELEMENT);
-                entry.setAttribute(EXTENSION_ATTRIBUTE, extension);
-                document.getDocumentElement().appendChild(entry);
-            }
-            // Replace the text in this node. Remember to replace the dummy filename with %1
-            MSMUtils.setValue(entry, command.replaceAll(filename, FILENAME_ARG));
-            }
-        }
-        if(command != null) {
-            // 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);
-        }
-        }
+            // Replace the text in this node. Remember to replace the dummy filename with %1
+            MSMUtils.setValue(entry, command.replaceAll(filename, FILENAME_ARG));
+        }
+        }
+        if(command != null) {
+        // 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);
+        }
+        
         entry = null;
         extension = null;