Changeset 32779 for main

Timestamp:

2019-02-16T19:36:06+13:00 (5 years ago)

Author:

ak19

Message:

1. Bugfix to wget downloading: call to quotewords() necessarily has 2nd parameter keep set to to false/0, in order to remove quotes from cmd args, but which also has the undesirable side-effect of removing single backslashes (while double backslashes get turned to single backslashes). This caused a bug in the download tutorial failing as the cache dir on windows, which contained backslashes going in, ended up containing no backslashes at all when wget was run. The correct place to fix it is before quotewords() gets called in WgetDownload's 2 UseWget() methods. Before quotewords() is called, singlebackslashes are now protected as double backslashes, so that quotewords with 2nd param keep=0 now gets things back to normal by turning double backslashes to single again. 2. Minor change to MediaWikiDownload to reuse variable.

Location:

main/trunk/greenstone2/perllib/downloaders

Files:

• MediaWikiDownload.pm (modified) (1 diff)
• WgetDownload.pm (modified) (3 diffs)

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

@@ -114 +114 @@
     # Setup the command for using wget
     $wget_options = "-N -k -x -t 2 -P \"". $hashGeneralOptions->{"cache_dir"}."\" $strWgetOptions $strOptions ";
-    my $cmdWget = "-N -k -x -t 2 -P \"". $hashGeneralOptions->{"cache_dir"}."\" $strWgetOptions $strOptions " . $self->{'url'};
+    my $cmdWget   = $wget_options . $self->{'url'};
     
     # Download the web pages

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

@@ -374 +374 @@
     $cmdWget =~ s/\s+$//;
 
+    # replace backslashes with double backslashes, so that we preserve backslash after doing quotewords() step below with its necessary 2nd param keep=0
+    $cmdWget =~ s@\\@\\\\@g;
+    
     # split on "words"
     #my @commandargs = split(' ', $cmdWget);
@@ -381 +384 @@
     my @commandargs = quotewords('\s+', 0, $cmdWget);
     unshift(@commandargs, $wget_file_path); # prepend the wget cmd
-    #print STDERR "Command is: ".join(",", @commandargs) . "\n"; # goes into ServerInfoDialog
+    print STDOUT "Command is: ".join(",", @commandargs) . "\n"; # if STDERR, cmd will go into ServerInfoDialog
     
     # Wget's output needs to be monitored to find out when it has naturally terminated.
@@ -651 +654 @@
     $cmdWget =~ s/^\s+//;
     $cmdWget =~ s/\s+$//;
+    
+    # replace backslashes with double backslashes, so that we preserve backslash after doing quotewords() step below with its necessary 2nd param keep=0
+    $cmdWget =~ s@\\@\\\\@g;
+    
     my @commandargs = quotewords('\s+', 0, $cmdWget);
     unshift(@commandargs, $wget_file_path); # prepend wget cmd to the command array