Revert "Bug 3226 - Extended characters inconsistantly displayed"

This reverts commit 1ddb5df863c3166a20d55c8f852af7c5fd67e204.

diff --git a/C4/Context.pm b/C4/Context.pm
index 7ba57fb..4dab9a9 100644 (file)
--- 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 c43169f..456204a 100644 (file)
--- 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;