Changeset 31641 for main/trunk/gli

Timestamp:

2017-05-02T18:15:31+12:00 (7 years ago)

Author:

ak19

Message:

Bugfix after changing over to SafeProcess: XML parsing failed because of something else being printed to STDERR before the actual XML, which the old code had been handling. Now the new code handles it too.

File:

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

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

@@ -206 +206 @@
     // Run pluginfo.pl to get the list of plugins
     try {
-        StringBuffer xml = null;
+        String xml = null;
         if (Gatherer.isGsdlRemote) {
         String pluginfo_options = "&listall";
@@ -213 +213 @@
         }
         String pluginfo_output = Gatherer.remoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options);
-        xml = new StringBuffer(pluginfo_output);
+        xml = pluginfo_output;
         }
         else {
@@ -247 +247 @@
                     + exitVal);
         }
-        // get the result: We expect XML to have come out of the process std error stream.
-        xml = new StringBuffer(process.getStdError());
+        // get the result: We expect XML to have come out of the process std error stream.  
+        xml = process.getStdError();
+
+        // for pluginfo.pl -listall, we see a "AutoloadConverters" (PDFBox) message
+        // before actual XML output, which breaks XML parsing. Get rid of output before "<?xml"
+        int startIndex = xml.indexOf("<?xml");
+        if(startIndex != 0) {
+            xml = xml.substring(startIndex);
+        }
         ///System.err.println("*********\nPluginsList, got:\n" + xml + "\n**********\n");
         }
@@ -259 +266 @@
 
         if (collection_name != null) {
-        collection_specific_plugins_list = parsePluginsListXML(xml.toString());
+        collection_specific_plugins_list = parsePluginsListXML(xml);
         }
         else {
-        core_greenstone_plugins_list = parsePluginsListXML(xml.toString());
+        core_greenstone_plugins_list = parsePluginsListXML(xml);
         }
     }