From 4809536e8f561ea708264b80d415b10b4703a9fd Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 2 Jun 2020 11:05:12 +0200 Subject: [PATCH] Bug 17842: Simplify the code There is no need for all the conditions. From Encode::encode POD: "If the $string is undef, then undef is returned." Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 74c7530e3dacd7a1df9ed72d031bc1a5b7063142) Signed-off-by: Lucas Gass (cherry picked from commit 6802d1a67e47fae0982c969f414b05f4f6a7cc28) Signed-off-by: Aleisha Amohia --- basket/downloadcart.pl | 13 +++---------- opac/opac-downloadcart.pl | 12 +++--------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/basket/downloadcart.pl b/basket/downloadcart.pl index b69c7e2bba..487e9c626a 100755 --- a/basket/downloadcart.pl +++ b/basket/downloadcart.pl @@ -71,16 +71,9 @@ if ($bib_list && $format) { next unless $record; if ($format eq 'iso2709') { - my $usmarc = $record->as_usmarc(); - if ($usmarc){ - #NOTE: If we don't explicitly UTF-8 encode the output, - #the browser will guess the encoding, and it won't always choose UTF-8. - my $bytes = encode("UTF-8", $usmarc); - if ($bytes) { - $output .= $bytes; - } - - } + #NOTE: If we don't explicitly UTF-8 encode the output, + #the browser will guess the encoding, and it won't always choose UTF-8. + $output .= encode("UTF-8", $record->as_usmarc()) // q{}; } elsif ($format eq 'ris') { $output .= marc2ris($record); diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl index f08dea13f1..35214ea0e9 100755 --- a/opac/opac-downloadcart.pl +++ b/opac/opac-downloadcart.pl @@ -90,15 +90,9 @@ if ($bib_list && $format) { next unless $record; if ($format eq 'iso2709') { - my $usmarc = $record->as_usmarc(); - if ($usmarc) { - #NOTE: If we don't explicitly UTF-8 encode the output, - #the browser will guess the encoding, and it won't always choose UTF-8. - my $bytes = encode("UTF-8", $usmarc); - if ($bytes) { - $output .= $bytes; - } - } + #NOTE: If we don't explicitly UTF-8 encode the output, + #the browser will guess the encoding, and it won't always choose UTF-8. + $output .= encode("UTF-8", $record->as_usmarc()) // q{}; } elsif ($format eq 'ris') { $output .= marc2ris($record); -- 2.39.5