Changeset 5075

Timestamp:

2003-08-01T14:44:58+12:00 (21 years ago)

Author:

jmt12

Message:

Fixed problems with supplying config argument to server.exe - changes at line no. 735 and replaced the entirity of ExternalApplication

File:

• trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (4 diffs)

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

@@ -732 +732 @@
                 gsdlsite_cfg.set();
                 // Spawn server
-                String[] command = new String[2];
-                command[0] = config.exec_file.getAbsolutePath();
-                command[1] = gsdlsite_cfg.getSiteConfigFilename();
+                String command = config.exec_file.getAbsolutePath() + " " + gsdlsite_cfg.getSiteConfigFilename();
                 server = new ExternalApplication(command);
                 server.start();
@@ -759 +757 @@
                     }
 
-                    if(gsdlsite_cfg.getURL() != null) {
+                    if((url = gsdlsite_cfg.getURL()) != null) {
                         // Ta-da. Now the url should be available.
                         config.exec_address = new URL(url);
@@ -847 +845 @@
     private Process process = null;
     /** The initial command string given to this sub-process. */
-    private String[] command = null;
+    private String command = null;
+    private String[] commands = null;
     /** Constructor.
      * @param command The initial command <strong>String</strong>.
      */
-    public ExternalApplication(String large_command) {
-        CommandTokenizer tokenizer = new CommandTokenizer(large_command);
-        while(tokenizer.hasMoreTokens()) {
-        if(command == null) {
-            command = new String[1];
-            command[0] = tokenizer.nextToken();
-        }
-        else {
-            command = ArrayTools.add(command, tokenizer.nextToken());
-        }
-        }
-    }
-
-    public ExternalApplication(String[] command) {
+    public ExternalApplication(String command) {
         this.command = command;
+    }
+
+    public ExternalApplication(String[] commands) {
+        this.commands = commands;
     }
     /** We start the child process inside a new thread so it doesn't block the rest of Gatherer.
@@ -877 +867 @@
         // Call an external process using the args.
         try {
-        StringBuffer whole_command = new StringBuffer();
-        for(int i = 0; i < command.length; i++) {
-            whole_command.append(command[i]);
-            whole_command.append(" ");
+        if(commands != null) {
+            StringBuffer whole_command = new StringBuffer();
+            for(int i = 0; i < commands.length; i++) {
+            whole_command.append(commands[i]);
+            whole_command.append(" ");
+            }
+            println("Running " + whole_command.toString());
+            Runtime rt = Runtime.getRuntime();
+            process = rt.exec(commands);
+            process.waitFor();
         }
-        println("Running " + whole_command.toString());
-        whole_command = null;
-        Runtime rt = Runtime.getRuntime();
-        process = rt.exec(command);
-        process.waitFor();
+        else {
+            println("Running " + command);
+            Runtime rt = Runtime.getRuntime();
+            process = rt.exec(command);
+            process.waitFor();
+        }
         }
         catch (Exception error) {