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

Timestamp:

2017-08-17T16:15:10+12:00 (6 years ago)

Author:

ak19

Message:

With Kathy's commit 31896 doing away with the need for the recently introduced gsprintf_multiline() by moving the regex replacements of backslash-n (and backslash-t) with newline and tab into gsprint::lookup_string, can now shift WebDownload calls to gsprintf_multine to use regular gsprintf. Putting back the original gsprintf method as gsprintf_multiline is no longer needed.

File:

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

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

@@ -203 +203 @@
     
     if ($self->{'proxy_on'}) { # if proxying set, the settings may be wrong
-        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.proxied_connect_failed_info}\n");
+        &gsprintf::gsprintf(STDERR, "{WebDownload.proxied_connect_failed_info}\n");
         
         if($self->{'http_proxy_host'} && defined $self->{'http_proxy_port'}) {
-        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.http_proxy_settings}\n", $self->{'http_proxy_host'}, $self->{'http_proxy_port'});
+        &gsprintf::gsprintf(STDERR, "{WebDownload.http_proxy_settings}\n", $self->{'http_proxy_host'}, $self->{'http_proxy_port'});
         }
         if($self->{'https_proxy_host'} && defined $self->{'https_proxy_port'}) {
-        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.https_proxy_settings}\n", $self->{'https_proxy_host'}, $self->{'https_proxy_port'});
+        &gsprintf::gsprintf(STDERR, "{WebDownload.https_proxy_settings}\n", $self->{'https_proxy_host'}, $self->{'https_proxy_port'});
         }
         if($self->{'ftp_proxy_host'} && defined $self->{'ftp_proxy_port'}) {
-        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.ftp_proxy_settings}\n", $self->{'ftp_proxy_host'}, $self->{'ftp_proxy_port'});
+        &gsprintf::gsprintf(STDERR, "{WebDownload.ftp_proxy_settings}\n", $self->{'ftp_proxy_host'}, $self->{'ftp_proxy_port'});
         }
     } else { # else no proxy set, the user may need proxy settings
-        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.proxyless_connect_failed_info}\n");
+        &gsprintf::gsprintf(STDERR, "{WebDownload.proxyless_connect_failed_info}\n");
     }
     
@@ -221 +221 @@
     # but the site had no valid certificate and no_check_certificate wasn't turned on
     # suggest to the user to try turning it on
-    &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.connect_failed_info}\n");
+    &gsprintf::gsprintf(STDERR, "{WebDownload.connect_failed_info}\n");
     
     print STDERR "<<Finished>>\n";