Changeset 13176 for trunk/gli

Timestamp:

2006-10-27T15:07:14+13:00 (18 years ago)

Author:

mdewsnip

Message:

Added NPE fix and an efficiency change to prevent an unnecessary String -> StringBuffer -> String conversion.

Location:

trunk/gli/src/org/greenstone/gatherer/greenstone

Files:

• Classifiers.java (modified) (3 diffs)
• Plugins.java (modified) (3 diffs)

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

@@ -129 +129 @@
     // Run classifierfo.pl to get the list of classifiers
     try {
-        StringBuffer xml = null;
+        String classinfo_xml = null;
         if (Gatherer.isGsdlRemote) {
         String classinfo_options = "&classifier=" + classifier;
@@ -135 +135 @@
             classinfo_options += "&collection=" + collection_name;
         }
-        String classinfo_output = RemoteGreenstoneServer.getScriptOptions("classinfo.pl", classinfo_options);
-        xml = new StringBuffer(classinfo_output);
+        classinfo_xml = RemoteGreenstoneServer.getScriptOptions("classinfo.pl", classinfo_options);
         }
         else {
@@ -158 +157 @@
         Process process = runtime.exec((String[]) args.toArray(new String[] { }));
         InputStream input_stream = process.getErrorStream();
-        xml = XMLTools.readXMLStream(input_stream);
+        StringBuffer classinfo_xml_buffer = XMLTools.readXMLStream(input_stream);
+        if (classinfo_xml_buffer != null) {
+            classinfo_xml = classinfo_xml_buffer.toString();
+        }
         }
 
         // Check the XML output was obtained successfully
-        if (xml == null || xml.length() == 0) {
+        if (classinfo_xml == null || classinfo_xml.length() == 0) {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.ClassifierManager.Classifier_XML_Parse_Failed", classifier.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         return;
         }
 
-        parseClassifierInfoXML(classifier, xml.toString());
+        parseClassifierInfoXML(classifier, classinfo_xml);
     }
     catch (Exception exception) {

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

@@ -130 +130 @@
     // Run pluginfo.pl to get the list of plugins
     try {
-        StringBuffer xml = null;
+        String pluginfo_xml = null;
         if (Gatherer.isGsdlRemote) {
         String pluginfo_options = "&plugin=" + plugin;
@@ -136 +136 @@
             pluginfo_options += "&collection=" + collection_name;
         }
-        String pluginfo_output = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options);
-        xml = new StringBuffer(pluginfo_output);
+        pluginfo_xml = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options);
         }
         else {
@@ -159 +158 @@
         Process process = runtime.exec((String[]) args.toArray(new String[] { }));
         InputStream input_stream = process.getErrorStream();
-        xml = XMLTools.readXMLStream(input_stream);
+        StringBuffer pluginfo_xml_buffer = XMLTools.readXMLStream(input_stream);
+        if (pluginfo_xml_buffer != null) {
+            pluginfo_xml = pluginfo_xml_buffer.toString();
+        }
         }
 
         // Check the XML output was obtained successfully
-        if (xml == null || xml.length() == 0) {
+        if (pluginfo_xml == null || pluginfo_xml.length() == 0) {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         return;
         }
 
-        parsePluginInfoXML(plugin, xml.toString());
+        parsePluginInfoXML(plugin, pluginfo_xml);
     }
     catch (Exception exception) {