Changeset 31860 for main/trunk/greenstone2/perllib/downloaders/WgetDownload.pm

Timestamp:

2017-08-09T16:48:21+12:00 (7 years ago)

Author:

ak19

Message:

The changes necessary for getting the new no_check_certificate checkbox to appear and work in GLI and get propagated to the perl code that launches wget. This checkbox controls whether wget is launched with the no-check-certificate flag to retrieve Https URLs despite lack of (valid) certificates.

File:

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

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

@@ -70 +70 @@
     'type' => "string",
     'reqd' => "no",
-    'hiddengli' => "yes"}];
+    'hiddengli' => "yes"},
+      { 'name' => "no_check_certificate", 
+    'desc' => "{WgetDownload.no_check_certificate}",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes"}
+     ];
 
 my $options = { 'name'     => "WgetDownload",
@@ -183 +189 @@
     }
 
-    if($self->{'no_check_certificate'} && $self->{'url'} =~ m/^https\:/) {
-        $strOptions .= " --no-check-certificate ";
-    }
+    if($self->{'no_check_certificate'}) { #&& $self->{'url'} =~ m/^https\:/) { # URL may be http that gets redirected to https
+    
+    $strOptions .= " --no-check-certificate ";
+    }
     
     return $strOptions;