Changeset 31860 for main/trunk/greenstone2/perllib/gsprintf.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/gsprintf.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/gsprintf.pm

@@ -71 +71 @@
 sub gsprintf
 {
+    my ($handle, $text_string, @text_arguments) = @_;    
+    _gsprintf($handle, $text_string, 0, @text_arguments);
+}
+
+sub gsprintf_multiline
+{
     my ($handle, $text_string, @text_arguments) = @_;
+    _gsprintf($handle, $text_string, 1, @text_arguments);
+}
+
+sub _gsprintf
+{
+    my ($handle, $text_string, $multiline, @text_arguments) = @_;
 
     # Return unless the required arguments were supplied
@@ -82 +94 @@
     my $text_string_resolved = sprintf($text_string, @text_arguments);
 
+    if($multiline) { # replace newlines
+    $text_string_resolved =~ s@\\n@\n@g;
+    }
+    
     if ($freetext_xml_mode) {
     $text_string_resolved = make_freetext_xml_safe($text_string_resolved);
     }
-
+    
     print $handle $text_string_resolved;
 }
 
-    
+
 
 sub lookup_string