gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <julian.maurice@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2020-06-02 11:05:12 +02:00
parent 13ec430ecc
commit 74c7530e3d
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
basket/downloadcart.pl
View File

@ -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);

12
opac/opac-downloadcart.pl
View File

@ -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);