From 2d0cffbbdb28a7d94ef93aa56e8a8d71e4c7415d Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 16 Mar 2018 09:52:19 +0100 Subject: [PATCH] Bug 19436: (QA follow-up) Revert change in _handle_one_result Content-Type: text/plain; charset=utf-8 See Bugzilla comment 7. This change does not belong here and is dubious on its own. Needs further attention on another report. Signed-off-by: Marcel de Rooy --- C4/Breeding.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/C4/Breeding.pm b/C4/Breeding.pm index bed7912..1654d77 100644 --- a/C4/Breeding.pm +++ b/C4/Breeding.pm @@ -315,9 +315,11 @@ sub _handle_one_result { my $raw= $zoomrec->raw(); my $marcrecord; if( $servhref->{servertype} eq 'sru' ) { - $raw= MARC::Record->new_from_xml( $raw, $servhref->{encoding}, $servhref->{syntax} ); + $marcrecord= MARC::Record->new_from_xml( $raw, 'UTF-8', + $servhref->{syntax} ); + } else { + ($marcrecord) = MarcToUTF8Record($raw, C4::Context->preference('marcflavour'), $servhref->{encoding} // "iso-5426" ); #ignores charset return values } - ($marcrecord) = MarcToUTF8Record($raw, C4::Context->preference('marcflavour'), $servhref->{encoding} // "iso-5426" ); #ignores charset return values SetUTF8Flag($marcrecord); my $error; ( $marcrecord, $error ) = _do_xslt_proc($marcrecord, $servhref, $xslh); -- 2.1.4