Changeset 31860 for main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

Timestamp:

2017-08-09T16:48:21+12:00 (7 years ago)

Author:

ak19

Message:

The changes necessary for getting the new no_check_certificate checkbox to appear and work in GLI and get propagated to the perl code that launches wget. This checkbox controls whether wget is launched with the no-check-certificate flag to retrieve Https URLs despite lack of (valid) certificates.

File:

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

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

@@ -571 +571 @@
         // redirect url (we do this step in order to avoid some unintuitive behaviour from wget)
         Download current_download = (Download)download_map.get(mode);
+        
+        boolean noCheckCertificate = Configuration.get("general.no_check_certificate", true);       
+        Argument no_check_cert_arg = current_download.getArgument("no_check_certificate");
+        if(noCheckCertificate) {
+            no_check_cert_arg.setValue("true");
+            no_check_cert_arg.setAssigned(true);
+        } else {
+            no_check_cert_arg.setValue("false");
+            no_check_cert_arg.setAssigned(false); // only assigned Arguments have values
+        }
+
         Argument arg_url = current_download.getArgument("url");
         
@@ -576 +587 @@
             String url_str = arg_url.getValue();    
             
-            // No longer following URL redirects, since some of this has been taken care of by wget
-            // For the rest, assume the user will get the URL right that they want to download from
-            /*
-            String redirect_url_str = getRedirectURL(url_str);
-            
-            // only update the Argument and its GUI ArgumentControl if the URL
-            // has in fact changed
-            if(!url_str.equals(redirect_url_str)) {
-            arg_url.setValue(redirect_url_str);
-            updateArgument(arg_url, redirect_url_str);
-            }
-            */
+            // No longer following URL redirects, since some of this has been taken care of by wget
+            // For the rest, assume the user will get the URL right that they want to download from
+            /*
+              String redirect_url_str = getRedirectURL(url_str);
+              
+              // only update the Argument and its GUI ArgumentControl if the URL
+              // has in fact changed
+              if(!url_str.equals(redirect_url_str)) {
+              arg_url.setValue(redirect_url_str);
+              updateArgument(arg_url, redirect_url_str);
+              }
+            */
         }
         
@@ -758 +769 @@
         // Write the use proxy command - we don't do this anymore, instead we set environment variables - hopefully these can't be spied on like the following can (using ps) - actually the environment stuff didn't work for windows, so lets go back to this
         if (Utility.isWindows()) {
-             
-           arg.setValue("true");
+           
+           arg.setValue("true"); // proxy_on argument
            arg.setAssigned(true);
-
+           
            arg = current_download.getArgument("proxy_host");
            arg.setValue(proxy_host);
            arg.setAssigned(true);
-
+           
            arg = current_download.getArgument("proxy_port");
            arg.setValue(proxy_port);
            arg.setAssigned(true);
-
+        
            arg = current_download.getArgument("user_name");
            arg.setValue(user_pass.substring(0, user_pass.indexOf("@")));
@@ -822 +833 @@
         }
 
+        boolean noCheckCertificate = Configuration.get("general.no_check_certificate", true);
+        Argument no_check_cert_arg = current_download.getArgument("no_check_certificate");
+        if(noCheckCertificate) {        
+        no_check_cert_arg.setValue("true");
+        no_check_cert_arg.setAssigned(true);
+        } else {
+        no_check_cert_arg.setValue("false");
+        no_check_cert_arg.setAssigned(false); // only assigned Arguments have values
+        }
+        
+        
         //str_url = getRedirectURL(str_url); // work out the real URL