Changeset 31880 for main/trunk/gli/src/org/greenstone/gatherer/download/ServerInfoDialog.java

Timestamp:

2017-08-14T22:23:04+12:00 (7 years ago)

Author:

ak19

Message:

All the changes that were required to set up multiple proxy servers, one for HTTP, one for HTTPS, one for FTP. Still need to test on Windows

File:

• main/trunk/gli/src/org/greenstone/gatherer/download/ServerInfoDialog.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/download/ServerInfoDialog.java

@@ -8 +8 @@
 import java.io.*;
 import java.util.ArrayList;
+import java.util.Properties;
 import org.greenstone.gatherer.cdm.Argument;
 import org.greenstone.gatherer.Configuration;
@@ -27 +28 @@
     private JDialog info_dialog;
     private Download download;
-    private String proxy_url;
+    private Properties proxy_urls;
     
-    public ServerInfoDialog(String url, String proxy_url, String mode, Download download) {
+    public ServerInfoDialog(String url, Properties proxy_urls, String mode, Download download) {
     super();
     this.url = url;
     this.mode = mode;
         this.download = download;
-        this.proxy_url = proxy_url;
+        this.proxy_urls = proxy_urls;
     this.info_dialog = this;
     
@@ -106 +107 @@
     try {       
         SafeProcess prcs = null;
-        
-        if (proxy_url != null && !proxy_url.equals("")) {
-            // Specify proxies as environment variables
-            // Need to manually specify GSDLHOME and GSDLOS also
-            
-            proxy_url = proxy_url.replaceAll("http://","");
-            
-            String [] env = new String[7];
-            
-            env[0] = "http_proxy=http://"+proxy_url;
-            env[1] = "https_proxy=http://"+proxy_url; // yes, HTTP protocol for https:// too
-            // see also https://wiki.archlinux.org/index.php/proxy_settings
-            env[2] = "ftp_proxy=ftp://"+proxy_url;
-            env[3] = "GSDLHOME=" + Configuration.gsdl_path;
-            env[4] = "GSDLOS=" + Gatherer.client_operating_system;
-            // teach it where the wgetrc file lives, in gs2build/bin/<os>:
-            env[5] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc";
-            // Issue discovered on Windows: If PATH is not made available to perl, so that wget or something else needed by
-            // WgetDownload.pm's open3()  call is not on the PATH, then the perl open() call to run wget fails.
-            // So make PATH available to get open3() working:
-            env[6] = "PATH="+System.getenv("PATH");
-            
-            prcs = new SafeProcess(command, env, null);
-        } 
-        else {
-            // Will inherit the GLI's environment, with GSDLHOME and GSDLOS set
-            prcs = new SafeProcess(command);
+
+        if (proxy_urls.size() != 0) {
+        // Specify proxies as environment variables
+        // Need to manually specify GSDLHOME and GSDLOS also
+        String[] env = new String[4+proxy_urls.size()];
+
+        env[0] = "GSDLHOME=" + Configuration.gsdl_path;
+        env[1] = "GSDLOS=" + Gatherer.client_operating_system;
+        // teach it where the wgetrc file lives, in gs2build/bin/<os>:
+        env[2] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc";
+        // Issue discovered on Windows: If PATH is not made available to perl, so that wget or something else needed by
+        // WgetDownload.pm's open3()  call is not on the PATH, then the perl open() call to run wget fails.
+        // So make PATH available to get open3() working:
+        env[3] = "PATH="+System.getenv("PATH");     
+
+        int next_index = 4;
+        String proxy_url = proxy_urls.getProperty("HTTP");
+        if(proxy_url != null) {
+            env[next_index] = "http_proxy="+proxy_url;
+            next_index++;
         }
+        proxy_url = proxy_urls.getProperty("HTTPS");
+        if(proxy_url != null) {
+            env[next_index] = "https_proxy="+proxy_url;
+            next_index++;
+        }
+        proxy_url = proxy_urls.getProperty("FTP");
+        if(proxy_url != null) {
+            env[next_index] = "ftp_proxy="+proxy_url;
+            next_index++;
+        }               
+        
+        prcs = new SafeProcess(command, env, null);
+        } else {
+        // Will inherit the GLI's environment, with GSDLHOME and GSDLOS set
+        prcs = new SafeProcess(command);
+        }
         
         // special processing of Process' stderr stream: