Changeset 31851 for main/trunk/greenstone2
- Timestamp:
- 2017-08-03T19:28:08+12:00 (7 years ago)
- Location:
- main/trunk/greenstone2/perllib/downloaders
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/downloaders/WebDownload.pm
r17530 r31851 115 115 } 116 116 #my $cmdWget = "-N -k -x -t 2 -P \"".$hashGeneralOptions->{"cache_dir"}."\" $strWgetOptions $strOptions ".$self->{'url'}; 117 my $cmdWget = "-N -k -x -t 2 $strWgetOptions $strOptions $cache_dir " .$self->{'url'}; 118 117 my $cmdWget = "-N -k -x -t 2 --read-timeout=2 --connect-timeout=2 $strWgetOptions $strOptions $cache_dir " .$self->{'url'}; 118 119 #print STDOUT "\n@@@@ RUNNING WGET CMD: $cmdWget\n\n"; 120 119 121 # Download the web pages 120 122 # print "Start download from $self->{'url'}...\n"; … … 186 188 my $strOptions = $self->getWgetOptions(); 187 189 188 my $strBaseCMD = $strOptions." - q -O - \"$self->{'url'}\"";190 my $strBaseCMD = $strOptions." --timeout=4 --tries=1 -q -O - \"$self->{'url'}\""; 189 191 190 192 -
main/trunk/greenstone2/perllib/downloaders/WgetDownload.pm
r30520 r31851 167 167 { 168 168 169 $strOptions .= " -e httpproxy=$self->{'proxy_host'}:$self->{'proxy_port'} "; 169 if($self->{'url'} =~ m/^https\:/) { 170 $strOptions .= " -e https_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} "; 171 } else { 172 $strOptions .= " -e http_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} "; 173 } 170 174 171 175 if ($self->{'user_name'} && $self->{'user_password'}) … … 179 183 } 180 184 185 if($self->{'no_check_certificate'} && $self->{'url'} =~ m/^https\:/) { 186 $strOptions .= " --no-check-certificate "; 187 } 188 181 189 return $strOptions; 182 190 }
Note:
See TracChangeset
for help on using the changeset viewer.