Changeset 10576

Timestamp:

2005-08-28T16:58:35+12:00 (19 years ago)

Author:

mdewsnip

Message:

Rearranged a few things when using classinfo.pl and pluginfo.pl, to make this easier when using a remote Greenstone server.

Location:

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

Files:

• ClassifierManager.java (modified) (5 diffs)
• PluginManager.java (modified) (5 diffs)

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

@@ -309 +309 @@
     // Run classinfo on this classifier, and then send the results for parsing.
     try {
+        StringBuffer xml = null;
         if (Gatherer.isGsdlRemote) {
         String launch  = Gatherer.cgiBase + "launch";
@@ -320 +321 @@
         URLConnection launch_connection = launch_url.openConnection();
         input_stream = launch_connection.getInputStream();
+        xml = Utility.readXMLStream(input_stream);
         }
         else {
@@ -351 +353 @@
 
         input_stream = process.getErrorStream();
-        }
-
-        StringBuffer xml = Utility.readXMLStream(input_stream);
+        xml = Utility.readXMLStream(input_stream);
+        }
+
         document = CollectionDesignManager.XMLStringToDOM(xml,classifier);
     }
@@ -398 +400 @@
             URLConnection launch_connection = launch_url.openConnection();
             InputStream input_stream = launch_connection.getInputStream();
-            loadClassifiers(input_stream);
+            StringBuffer xml = Utility.readXMLStream(input_stream);
+            loadClassifiers(xml);
         }
         catch (Exception error) {
@@ -437 +440 @@
      * @param input_stream An <strong>InputStream</strong> indicating the where list of classifiers -- encoded in XML -- can be read from
      */
-    private void loadClassifiers(InputStream input_stream) 
+    private void loadClassifiers(StringBuffer xml)
     {
-    StringBuffer xml  = Utility.readXMLStream(input_stream);
     Document document = CollectionDesignManager.XMLStringToDOM(xml, "-listall");
 

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

@@ -441 +441 @@
     // Run pluginfo on this plugin, and then send the results for parsing.
     try {
+        StringBuffer xml = null;
         if (Gatherer.isGsdlRemote) {
         String launch  = Gatherer.cgiBase + "launch";
@@ -452 +453 @@
         URLConnection launch_connection = launch_url.openConnection();
         input_stream = launch_connection.getInputStream();
+        xml = Utility.readXMLStream(input_stream);
         }
         else {
@@ -482 +484 @@
         Process process = runtime.exec(args);
         input_stream = process.getErrorStream();
-        }
-
-        StringBuffer xml = Utility.readXMLStream(input_stream);
+        xml = Utility.readXMLStream(input_stream);
+        }
+
         document = CollectionDesignManager.XMLStringToDOM(xml,plugin);
     }
@@ -527 +529 @@
             URLConnection launch_connection = launch_url.openConnection();
             InputStream input_stream = launch_connection.getInputStream();
-            loadPlugins(input_stream);
+            StringBuffer xml = Utility.readXMLStream(input_stream);
+            loadPlugins(xml);
         }
         catch (Exception error) {
@@ -550 +553 @@
      * @param input_stream An <strong>InputStream</strong> indicating the where list of plugins -- encoded in XML -- can be read from
      */
-    private void loadPlugins(InputStream input_stream) 
+    private void loadPlugins(StringBuffer xml)
     {
-    StringBuffer xml  = Utility.readXMLStream(input_stream);
     Document document = CollectionDesignManager.XMLStringToDOM(xml, "-listall");