[Koha-patches] [PATCH] Bug 3226 - Extended characters inconsistantly displayed - NoZebra

[Frédéric Demians]

Fix errors introduced by previous patch on NoZebra installation.
Thanks Lupin.
---
 C4/Search.pm |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 4b113c1..f2f738d 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1838,6 +1838,7 @@ sub NZorder {
     $results_per_page = 20 unless $results_per_page;
     $offset           = 0  unless $offset;
     my $dbh = C4::Context->dbh;
+    my $marcflavour = C4::Context->preference("marcflavour");
 
     #
     # order by POPULARITY
@@ -1869,13 +1870,13 @@ sub NZorder {
         if ( $ordering eq 'popularity_dsc' ) {    # sort popularity DESC
             foreach my $key ( sort { $b cmp $a } ( keys %popularity ) ) {
                 $result_hash->{'RECORDS'}[ $numbers++ ] =
-                  $result{ $popularity{$key} }->as_usmarc();
+                  $result{ $popularity{$key} }->as_xml_record( $marcflavour );
             }
         }
         else {                                    # sort popularity ASC
             foreach my $key ( sort ( keys %popularity ) ) {
                 $result_hash->{'RECORDS'}[ $numbers++ ] =
-                  $result{ $popularity{$key} }->as_usmarc();
+                  $result{ $popularity{$key} }->as_xml_record( $marcflavour );
             }
         }
         my $finalresult = ();
@@ -1893,7 +1894,7 @@ sub NZorder {
             my ( $biblionumber, $title ) = split /,/, $_;
             my $record = GetMarcBiblio($biblionumber);
             my $author;
-            if ( C4::Context->preference('marcflavour') eq 'UNIMARC' ) {
+            if ( $marcflavour eq 'UNIMARC' ) {
                 $author = $record->subfield( '200', 'f' );
                 $author = $record->subfield( '700', 'a' ) unless $author;
             }
@@ -1912,13 +1913,13 @@ sub NZorder {
         if ( $ordering eq 'author_za' ) {    # sort by author desc
             foreach my $key ( sort { $b cmp $a } ( keys %result ) ) {
                 $result_hash->{'RECORDS'}[ $numbers++ ] =
-                  $result{$key}->as_usmarc();
+                  $result{$key}->as_xml_record( $marcflavour );
             }
         }
         else {                               # sort by author ASC
             foreach my $key ( sort ( keys %result ) ) {
                 $result_hash->{'RECORDS'}[ $numbers++ ] =
-                  $result{$key}->as_usmarc();
+                  $result{$key}->as_xml_record( $marcflavour );
             }
         }
         my $finalresult = ();
@@ -1940,7 +1941,7 @@ sub NZorder {
             my ( $callnumber_tag, $callnumber_subfield ) = GetMarcFromKohaField(  'items.itemcallnumber', $frameworkcode);
                ( $callnumber_tag, $callnumber_subfield ) = GetMarcFromKohaField('biblioitems.callnumber', $frameworkcode)
                 unless $callnumber_tag;
-            if ( C4::Context->preference('marcflavour') eq 'UNIMARC' ) {
+            if ( $marcflavour eq 'UNIMARC' ) {
                 $callnumber = $record->subfield( '200', 'f' );
             } else {
                 $callnumber = $record->subfield( '100', 'a' );
@@ -1957,13 +1958,13 @@ sub NZorder {
         if ( $ordering eq 'call_number_dsc' ) {    # sort by title desc
             foreach my $key ( sort { $b cmp $a } ( keys %result ) ) {
                 $result_hash->{'RECORDS'}[ $numbers++ ] =
-                  $result{$key}->as_usmarc();
+                  $result{$key}->as_xml_record( $marcflavour );
             }
         }
         else {                                     # sort by title ASC
             foreach my $key ( sort { $a cmp $b } ( keys %result ) ) {
                 $result_hash->{'RECORDS'}[ $numbers++ ] =
-                  $result{$key}->as_usmarc();
+                  $result{$key}->as_xml_record( $marcflavour );
             }
         }
         my $finalresult = ();
@@ -1993,13 +1994,13 @@ sub NZorder {
         if ( $ordering eq 'pubdate_dsc' ) {    # sort by pubyear desc
             foreach my $key ( sort { $b cmp $a } ( keys %result ) ) {
                 $result_hash->{'RECORDS'}[ $numbers++ ] =
-                  $result{$key}->as_usmarc();
+                  $result{$key}->as_xml_record( $marcflavour );
             }
         }
         else {                                 # sort by pub year ASC
             foreach my $key ( sort ( keys %result ) ) {
                 $result_hash->{'RECORDS'}[ $numbers++ ] =
-                  $result{$key}->as_usmarc();
+                  $result{$key}->as_xml_record( $marcflavour );
             }
         }
         my $finalresult = ();
@@ -2051,7 +2052,7 @@ sub NZorder {
           )
         {
             $result_hash->{'RECORDS'}[$counter] =
-              GetMarcBiblio( $result_hash->{'RECORDS'}[$counter] )->as_usmarc;
+              GetMarcBiblio( $result_hash->{'RECORDS'}[$counter] )->as_xml_record( $marcflavour );
         }
         my $finalresult = ();
         $result_hash->{'hits'}         = $numbers;
@@ -2105,7 +2106,7 @@ sub NZorder {
           )
         {
             $result_hash->{'RECORDS'}[$counter] =
-              GetMarcBiblio( $result_hash->{'RECORDS'}[$counter] )->as_usmarc
+              GetMarcBiblio( $result_hash->{'RECORDS'}[$counter] )->as_xml_record( $marcflavour )
               if $result_hash->{'RECORDS'}[$counter];
         }
         my $finalresult = ();
-- 
1.5.6.5