Changeset 31864 for main/trunk/greenstone2/perllib/downloaders/WebDownload.pm

Timestamp:

2017-08-09T20:24:33+12:00 (7 years ago)

Author:

ak19

Message:

1. Modified GLI and perl to set proxy_on, proxy_host and proxy_port for unix too, whereas in the past, only http(s)_proxy ENV vars were set by GLI for unix. If the env vars are not set, then perl assumes it's the wget setup for windows and passes the proxy vars that were set by GLI as flags to wget. If the env vars were set, then perl should run wget without setting the proxy vars as flags to wget, and wget will use the proxying info in the environment. So now, the decision as to whether proxy vars are set or not will result in context specific suggestion messages to the user when the Server Info button was pressed and if the URL could not be accessed for whatever reason. 2. Modified GLI code to not use proxy if proxying is toggled off, but use proxy when it's toggled back on. (Previously, if proxying was set at any point during a GLI session, then GLI remembered that even when proxying was turned off thereafter.)

File:

• main/trunk/greenstone2/perllib/downloaders/WebDownload.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/downloaders/WebDownload.pm

@@ -40 +40 @@
 use strict; # every perl program should have this!
 no strict 'refs'; # make an exception so we can use variables as filehandles
-no strict 'subs';
+no strict 'subs'; # to pass STDERR/STDOUT to functions
+
 use gsprintf 'gsprintf';
 
@@ -192 +193 @@
     my $strBaseCMD = $strOptions." --tries=2 -q -O - \"$self->{'url'}\"";
 
-    #print STDOUT "\n@@@@ GETTING server_info with WGET CMD: $strBaseCMD\n\n";
-    
     my $strIdentifyText = $self->useWget($strBaseCMD);
     
@@ -200 +199 @@
     print STDERR "Server information is unavailable.\n";
 
+    #&util::print_env(STDERR, "https_proxy", "http_proxy");
+    
     if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'}) { # if proxying set, the settings may be wrong
         &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.proxied_connect_failed_info}\n", $self->{'proxy_host'}, $self->{'proxy_port'});