Changeset 31878 for main/trunk/greenstone2/perllib/downloaders/WgetDownload.pm

Timestamp:

2017-08-11T18:22:36+12:00 (7 years ago)

Author:

ak19

Message:

1. Previous commit message was incorrect: it wasn't that perl wasn't found that resulted in the open3() failure error message, but that something on the PATH wasn't available to it, possible wget itself. 2. Updating unused DownloadJob.old_callDownload() to have the recently committed changes in callDownload(). 3. Emacs tabbing for recently committed files.

File:

• main/trunk/greenstone2/perllib/downloaders/WgetDownload.pm (modified) (2 diffs)

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

@@ -169 +169 @@
 sub addProxySettingsAsWgetFlags
 {
-    my ($self) = @_;
-    my $strOptions = "";
-    
-    if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'})
-    {
-        $strOptions .= " -e https_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";  
-        $strOptions .= " -e http_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";       
-        
-        if ($self->{'user_name'} && $self->{'user_password'})
-        {
-        $strOptions .= "--proxy-user=$self->{'user_name'}"." --proxy-passwd=$self->{'user_password'}";
-        }
-    }
-
-    if ($self->{'proxy_on'}) {
-        $strOptions .= " --proxy ";
-    }
-    
-    return $strOptions;
-}
-
-sub getWgetOptions
-{
     my ($self) = @_;
     my $strOptions = "";
     
-    # If proxy settings are set up in the environment, wget is ready to use them. More secure.
-    # But if proxy settings are not set up in the environment, pass them as flags to wget
-    # This is less secure, as pwd etc visible in task manager, but it was the original way in
-    # which wget was run on windows.
-    # Truth in Perl: https://home.ubalt.edu/abento/452/perl/perltruth.html
+    if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'})
+    {
+    $strOptions .= " -e https_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";  
+    $strOptions .= " -e http_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";       
+    
+    if ($self->{'user_name'} && $self->{'user_password'})
+    {
+        $strOptions .= "--proxy-user=$self->{'user_name'}"." --proxy-passwd=$self->{'user_password'}";
+    }
+    }
+    
+    if ($self->{'proxy_on'}) {
+    $strOptions .= " --proxy ";
+    }
+    
+    return $strOptions;
+}
+
+sub getWgetOptions
+{
+    my ($self) = @_;
+    my $strOptions = "";
+    
+    # If proxy settings are set up in the environment, wget is ready to use them. More secure.
+    # But if proxy settings are not set up in the environment, pass them as flags to wget
+    # This is less secure, as pwd etc visible in task manager, but it was the original way in
+    # which wget was run on windows.
+    # Truth in Perl: https://home.ubalt.edu/abento/452/perl/perltruth.html
     # http://www.perlmonks.org/?node=what%20is%20true%20and%20false%20in%20Perl%3F
-
+    
     if (!$ENV{'http_proxy'} && !$ENV{'https_proxy'}) {
-        $strOptions .= $self->addProxySettingsAsWgetFlags();
+    $strOptions .= $self->addProxySettingsAsWgetFlags();
     } # else wget will use proxy settings in environment, assume enough settings have been provided
+    
+    if($self->{'no_check_certificate'}) { # URL may be http that gets redirected to https, so if no_check_certificate is on, turn it on even if URL is http
     
-    if($self->{'no_check_certificate'}) { # URL may be http that gets redirected to https, so if no_check_certificate is on, turn it on even if URL is http
-
     $strOptions .= " --no-check-certificate ";
     }
-    
+    
     return $strOptions;
 }
@@ -288 +288 @@
     # closing an extra unused handle, a single handle is used instead for both the child's
     # stderr and stdout.
-    # See http://blog.0x1fff.com/2009/09/howto-execute-system-commands-in-perl.html
-    # for why this is the right thing to do.
+    # See http://blog.0x1fff.com/2009/09/howto-execute-system-commands-in-perl.html
+    # for why this is the right thing to do.
 
     # Both open2 and open3 don't return on failure, but raise an exception. The handling