From 7013085ca56a6081f4e71ec703916fbd9b7161a0 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Tue, 14 Jul 2009 23:35:16 -0400 Subject: [PATCH] Revert "Bug 3226 - Extended characters inconsistantly displayed" This reverts commit 1ddb5df863c3166a20d55c8f852af7c5fd67e204. --- C4/Context.pm | 2 +- C4/Search.pm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/C4/Context.pm b/C4/Context.pm index 7ba57fb47d..4dab9a98c5 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -588,7 +588,7 @@ sub _new_Zconn { my $tried=0; # first attempt my $Zconn; # connection object $server = "biblioserver" unless $server; - $syntax = "xml" unless $syntax; + $syntax = "usmarc" unless $syntax; my $host = $context->{'listen'}->{$server}->{'content'}; my $servername = $context->{"config"}->{$server}; diff --git a/C4/Search.pm b/C4/Search.pm index c43169f68d..456204a98c 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1237,8 +1237,7 @@ sub searchResults { my $marcflavour = C4::Context->preference("marcflavour"); # loop through all of the records we've retrieved for ( my $i = $offset ; $i <= $times - 1 ; $i++ ) { - my $marcrecord = - MARC::Record::new_from_xml( $marcresults[$i], "utf8", $marcflavour ); + my $marcrecord = MARC::File::USMARC::decode( $marcresults[$i] ); my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, '' ); $oldbiblio->{subtitle} = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 'subtitle', $marcrecord, ''); $oldbiblio->{result_number} = $i + 1; -- 2.39.5