Changeset 4580

Timestamp:

2003-06-11T16:35:01+12:00 (21 years ago)

Author:

jmt12

Message:

2030124: Argument parsing now doesn't begin until the '<?xml' is detected, so as to avoid poorly formed XML errors because of PERL messages. Classifier argument harvesting could fail silently or give less than useful error messages. Now it displays a handy message dialog. How handy.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

@@ -35 +35 @@
  *########################################################################
  */
-
- 
-
-
-
-
-/* GPL_HEADER */
 package org.greenstone.gatherer.cdm;
-/**************************************************************************************
- * Title:        Gatherer
- * Description:  The Gatherer: a tool for gathering and enriching a digital collection.
- * Company:      The University of Waikato
- * Written:      01/05/02
- * Revised:      16/08/02 Optimized and Commented.
- **************************************************************************************/
+
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -289 +276 @@
         Runtime runtime = Runtime.getRuntime();
         Process process = runtime.exec(args);
-        InputStream input_stream = process.getErrorStream();
         BufferedReader error_in = new BufferedReader(new InputStreamReader(process.getErrorStream()));
         String line = "";
         StringBuffer xml = new StringBuffer("");
+        boolean xml_content = false;
         while((line = error_in.readLine()) != null) {
-        xml.append(line);
-        xml.append("\n");
-        }
-        // Then read the xml from the piped input stream.
-        InputSource source = new InputSource(new StringReader(xml.toString()));
-        DOMParser parser = new DOMParser();
-        parser.parse(source);
-        document = parser.getDocument();
+        if(xml_content) {
+            xml.append(line);
+            xml.append("\n");
+        }
+        else if(line.trim().startsWith("<?xml")) {
+            xml_content = true;
+            xml.append(line);
+            xml.append("\n");
+        }
+        }
+        error_in = null;
+        process = null;
+        runtime = null;
+        // If something has gone horribly wrong then xml will be empty.
+        if(xml.length() != 0) {
+        // Then read the xml from the piped input stream.
+        InputSource source = new InputSource(new StringReader(xml.toString()));
+        DOMParser parser = new DOMParser();
+        parser.parse(source);
+        document = parser.getDocument();
+        parser = null;
+        source = null;
+        }
+        else {
+        String classifier_name = getClassifierName(classifier);
+        Gatherer.println("Zero length argument xml detected for: " + classifier_name);
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("Classifier_XML_Parse_Failed", classifier_name), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        classifier_name = null;
+        }
     }
     catch (Exception error) {
@@ -537 +545 @@
       * @see org.greenstone.gatherer.Gatherer
       */
-    private String get(String key, String args[]) {
+    private String get(String key, String arg) {
+    String[] args = null;
+    if(arg != null) {
+        args = new String[1];
+        args[0] = arg;
+    }
     if(key.indexOf(".") == -1) {
         key = "CDM.ClassifierManager." + key;