Changeset 31957 for main/trunk/greenstone2

Timestamp:

2017-09-08T19:35:17+12:00 (7 years ago)

Author:

ak19

Message:

Tidying up. 1. Shifting informative error message to strings.properties. 2. Commenting out unnecessary message that was printed out for debugging when things went well. 3. To use gsprintf passing in STDERR/STDOUT as a parameter when use strict is on, need to make some exceptions to strict.

Location:

main/trunk/greenstone2/perllib

Files:

• downloaders/WebDownload.pm (modified) (1 diff)
• downloaders/WgetDownload.pm (modified) (5 diffs)
• strings.properties (modified) (1 diff)

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

@@ -135 +135 @@
     
     # if ($strResponse ne ""){print "$strResponse\n";}
-     print STDERR "Finish download from $self->{'url'}\n";
+     print STDERR "Finished downloading from $self->{'url'}\n";
 
     print STDERR "<<Finished>>\n";

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

@@ -34 +34 @@
 use BaseDownload;
 use strict;
+no strict 'subs'; # make an exception so we can use variables as filehandles to pass STDERR/STDOUT to functions, needed for gsprintf()
 use Cwd;
 use util;
@@ -468 +469 @@
               } else { # $! contains message "An existing connection was forcibly closed by remote host" where "remote" is a reference to the sockets to our wget child process,
                     # NOT to the remote web server we're downloading from. In such a case, the error code is ECONNRESET, and it's not an error, despite $len being undefined.
-                print STDERR "WgetDownload: wget finished\n";
+                #print STDERR "WgetDownload: wget finished\n";
               }
             }
@@ -474 +475 @@
             # Finished reading from this filehandle $fh because we read 0 bytes.
             # wget finished, terminate naturally
-            print STDERR "WgetDownload: wget finished\n";
-            #print STDOUT "\nPerl: open3 command, input streams closed. Wget terminated naturally.\n";
+            #print STDERR "WgetDownload: wget finished\n"; #print STDOUT "\nPerl: open3 command, input streams closed. Wget terminated naturally.\n";
             }
 
@@ -495 +495 @@
         $num_consecutive_timedouts = 0;
 
-        print STDERR "WARNING from WgetDownload: wget timed out $NUM_TRIES times waiting for a response\n";
-        print STDERR "\tThe URL may be inaccessible or the proxy configuration is wrong or incomplete.\n";
+        &gsprintf::gsprintf(STDERR, "{WgetDownload.wget_timed_out_warning}\n", $NUM_TRIES);
     }
 
@@ -732 +731 @@
         $num_consecutive_timedouts = 0;
 
-        #print STDERR "WARNING from WgetDownload: wget timed out $NUM_TRIES times waiting for a response\n";
-        #print STDERR "\tThe URL may be inaccessible or the proxy configuration is wrong or incomplete.\n";
+        #&gsprintf::gsprintf(STDERR, "{WgetDownload.wget_timed_out_warning}\n", $NUM_TRIES);
     }
 

main/trunk/greenstone2/perllib/strings.properties

@@ -1354 +1354 @@
 WgetDownload.user_password:User password
 WgetDownload.no_check_certificate:No check certificate
+WgetDownload.wget_timed_out_warning:WARNING: wget timed out %s times waiting for a response.\n\tThe URL may be inaccessible or the proxy configuration is wrong or incomplete.\n
 
 Z3950Download.desc:A module for downloading from Z3950 repositories