Changeset 19188

Timestamp:

2009-04-22T13:20:27+12:00 (15 years ago)

Author:

ak19

Message:

Changes made together with related changes in gliserver.pl for making the DownloadPane available in the remote client-gli. DownloadInfo.pl is called and gliserver now expects a downloader argument with the name of the downloader.

File:

• gli/trunk/src/org/greenstone/gatherer/gui/DownloadPane.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -228 +228 @@
     private Download loadDownload(String download_name, String lang) {
     Document document = null;
-    InputStream input_stream = null;
     
     try {
         if (Gatherer.isGsdlRemote) {
-        StringBuffer launch_str = new StringBuffer();
-        launch_str.append(Gatherer.cgiBase);
-        launch_str.append("launch");
-        launch_str.append("?cmd=downloadinfo.pl&xml=&language=");
-        launch_str.append(lang);
-        launch_str.append("&plug=");
-        launch_str.append(download_name);
-
-        String launch = launch_str.toString();      
-        System.err.println("*** launch = " + launch);
-
-        URL launch_url = new URL(launch);
-        URLConnection launch_connection = launch_url.openConnection();
-        input_stream = launch_connection.getInputStream();
+        String output = Gatherer.remoteGreenstoneServer.getScriptOptions("downloadinfo.pl", "&downloader="+download_name); //OR: "&listall";
+        Reader reader = new StringReader(output);
+        document = XMLTools.parseXML(reader);
         }
         else {
@@ -270 +258 @@
         Process process = runtime.exec(args);
         
-        input_stream = process.getErrorStream();
-        }
-
-            document = XMLTools.parseXML(input_stream);
+        InputStream input_stream = process.getErrorStream();
+        document = XMLTools.parseXML(input_stream);
+        }
+
+            
     }
     catch (Exception error) {