Changeset 10577

Timestamp:

2005-08-29T09:39:53+12:00 (19 years ago)

Author:

mdewsnip

Message:

Rearranged things a little for the West Yorkshire stuff.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/ScriptOptions.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/ScriptOptions.java

@@ -289 +289 @@
     // Run the required program.
     try {
-        String args[];
+        Document document;
         if (Gatherer.isGsdlRemote) {
-            String launch  = Gatherer.cgiBase + "launch";
-            launch += "?cmd=" + filename;
-            launch += "&xml=&language="+lang;
-
-            System.err.println("*** launch = " + launch);
-
-            URL launch_url = new URL(launch);
-            URLConnection launch_connection = launch_url.openConnection();
-            input_stream = launch_connection.getInputStream();
+        String launch  = Gatherer.cgiBase + "launch";
+        launch += "?cmd=" + filename;
+        launch += "&xml=&language="+lang;
+
+        System.err.println("*** launch = " + launch);
+
+        URL launch_url = new URL(launch);
+        URLConnection launch_connection = launch_url.openConnection();
+        input_stream = launch_connection.getInputStream();
+        document = XMLTools.parseXML(input_stream);
         }
         else {
+        String args[];
         if(Utility.isWindows()) {
             args = new String[6];
@@ -324 +326 @@
 
         input_stream = process.getErrorStream();
-        }
-
-        Document document = XMLTools.parseXML(input_stream);
+        document = XMLTools.parseXML(input_stream);
+        }
+
         arguments_element = document.getDocumentElement();
     }