Changeset 32779
- Timestamp:
- 2019-02-16T19:36:06+13:00 (5 years ago)
- Location:
- main/trunk/greenstone2/perllib/downloaders
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/downloaders/MediaWikiDownload.pm
r28250 r32779 114 114 # Setup the command for using wget 115 115 $wget_options = "-N -k -x -t 2 -P \"". $hashGeneralOptions->{"cache_dir"}."\" $strWgetOptions $strOptions "; 116 my $cmdWget = "-N -k -x -t 2 -P \"". $hashGeneralOptions->{"cache_dir"}."\" $strWgetOptions $strOptions ". $self->{'url'};116 my $cmdWget = $wget_options . $self->{'url'}; 117 117 118 118 # Download the web pages -
main/trunk/greenstone2/perllib/downloaders/WgetDownload.pm
r31975 r32779 374 374 $cmdWget =~ s/\s+$//; 375 375 376 # replace backslashes with double backslashes, so that we preserve backslash after doing quotewords() step below with its necessary 2nd param keep=0 377 $cmdWget =~ s@\\@\\\\@g; 378 376 379 # split on "words" 377 380 #my @commandargs = split(' ', $cmdWget); … … 381 384 my @commandargs = quotewords('\s+', 0, $cmdWget); 382 385 unshift(@commandargs, $wget_file_path); # prepend the wget cmd 383 #print STDERR "Command is: ".join(",", @commandargs) . "\n"; # goesinto ServerInfoDialog386 print STDOUT "Command is: ".join(",", @commandargs) . "\n"; # if STDERR, cmd will go into ServerInfoDialog 384 387 385 388 # Wget's output needs to be monitored to find out when it has naturally terminated. … … 651 654 $cmdWget =~ s/^\s+//; 652 655 $cmdWget =~ s/\s+$//; 656 657 # replace backslashes with double backslashes, so that we preserve backslash after doing quotewords() step below with its necessary 2nd param keep=0 658 $cmdWget =~ s@\\@\\\\@g; 659 653 660 my @commandargs = quotewords('\s+', 0, $cmdWget); 654 661 unshift(@commandargs, $wget_file_path); # prepend wget cmd to the command array
Note:
See TracChangeset
for help on using the changeset viewer.