Changeset 18358 for gli/branches/rtl-gli/src/org/greenstone/gatherer/collection/ScriptOptions.java

Timestamp:

2009-01-12T11:18:22+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318

File:

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

gli/branches/rtl-gli/src/org/greenstone/gatherer/collection/ScriptOptions.java

@@ -225 +225 @@
 
         if (Gatherer.isGsdlRemote) {
-        String script_output = RemoteGreenstoneServer.getScriptOptions(filename, "");
+        String script_output = Gatherer.remoteGreenstoneServer.getScriptOptions(filename, "");
         document = XMLTools.parseXML(new StringReader(script_output));
         }
@@ -247 +247 @@
         }
 
+
         // Create the process.
         Runtime runtime = Runtime.getRuntime();
         Process process = runtime.exec(args);
+
+        
+        for (int i=0; i<args.length; i++) { 
+            System.err.print(args[i] + " ");
+        }
+        System.err.println("");
+        
+
+
         document = XMLTools.parseXML(process.getErrorStream());
+        
+        if (document == null) {
+            // command has not generated XML, script has probably failed in some way
+            for (int i=0; i<args.length; i++) { 
+            DebugStream.print(args[i] + " ");
+            }
+            DebugStream.println("");
+        }
         }