Changeset 31898 for main/trunk/greenstone2/perllib/gsprintf.pm

Timestamp:

2017-08-17T16:15:10+12:00 (6 years ago)

Author:

ak19

Message:

With Kathy's commit 31896 doing away with the need for the recently introduced gsprintf_multiline() by moving the regex replacements of backslash-n (and backslash-t) with newline and tab into gsprint::lookup_string, can now shift WebDownload calls to gsprintf_multine to use regular gsprintf. Putting back the original gsprintf method as gsprintf_multiline is no longer needed.

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
@@ -93 +81 @@
     # Resolve the string arguments using sprintf, then write out to the handle
     my $text_string_resolved = sprintf($text_string, @text_arguments);
-
-    if($multiline) { # replace newlines
-    $text_string_resolved =~ s@\\n@\n@g;
-    }
     
     if ($freetext_xml_mode) {