Attachment 26748 Details for Bug 11944 – Bug 11944: Fix encoding issue on searching - latin characters

[patch] Bug 11944: Fix encoding issue on searching - latin characters

Bug-11944-Fix-encoding-issue-on-searching---latin-.patch (text/plain), 1.97 KB, created by Jonathan Druart on 2014-04-02 07:27:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-04-02 07:27:09 UTC

Size: 1.97 KB

patch

obsolete

>From 905d50e81ab175b7b152ca1726ead239522b382f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Mon, 17 Mar 2014 15:13:27 +0100
>Subject: [PATCH] Bug 11944: Fix encoding issue on searching - latin
> characters
>
>The search is still broken for non-latin characters.
>---
> C4/Output.pm |    2 ++
> C4/Search.pm |    4 ++++
> 2 files changed, 6 insertions(+)
>
>diff --git a/C4/Output.pm b/C4/Output.pm
>index 5dc03d7..7e705a0 100644
>--- a/C4/Output.pm
>+++ b/C4/Output.pm
>@@ -28,6 +28,7 @@ package C4::Output;
> use strict;
> #use warnings; FIXME - Bug 2505
> 
>+use Encode qw( encode );
> use URI::Escape;
> 
> use C4::Context;
>@@ -275,6 +276,7 @@ caching whatsoever.
> 
> sub output_with_http_headers {
>     my ( $query, $cookie, $data, $content_type, $status, $extra_options ) = @_;
>+    binmode( STDOUT, ":encoding(utf8)" );
>     $status ||= '200 OK';
> 
>     $extra_options //= {};
>diff --git a/C4/Search.pm b/C4/Search.pm
>index c2e9d9a..9717fbd 100644
>--- a/C4/Search.pm
>+++ b/C4/Search.pm
>@@ -493,6 +493,7 @@ sub getRecords {
>                     # not an index scan
>                     else {
>                         $record = $results[ $i - 1 ]->record($j)->raw();
>+                        Encode::decode('UTF-8', $record );
>                         # warn "RECORD $j:".$record;
>                         $results_hash->{'RECORDS'}[$j] = $record;
>                     }
>@@ -519,6 +520,8 @@ sub getRecords {
>                                 next;
>                             }
> 
>+                            Encode::decode('UTF-8', $marc_record);
>+
>                             my @used_datas = ();
> 
>                             foreach my $tag ( @{ $facet->{tags} } ) {
>@@ -720,6 +723,7 @@ sub pazGetRecords {
>         for (my $i = 0; $i < $count; $i++) {
>             # FIXME -- may need to worry about diacritics here
>             my $rec = $paz->record($recid, $i);
>+            Encode::decode('UTF-8', $rec );
>             push @{ $result_group->{'RECORDS'} }, $rec;
>         }
> 
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 11944: 26364 | 26365 | 26366 | 26367 | 26368 | 26369 | 26370 | 26371 | 26372 | 26407 | 26408 | 26409 | 26737 | 26738 | 26739 | 26740 | 26741 | 26742 | 26743 | 26744 | 26745 | 26746 | 26747 | 26748 | 26794 | 26857 | 26858 | 26859 | 26860 | 26861 | 26862 | 26863 | 26864 | 26865 | 26866 | 26867 | 26868 | 26869 | 26870 | 26871 | 26895 | 26921 | 27021 | 27080 | 27094 | 27158 | 27159 | 27161 | 27193 | 27194 | 27195 | 27196 | 27198 | 27199 | 27200 | 27201 | 27202 | 27203 | 27204 | 27205 | 27206 | 27207 | 27208 | 27209 | 27210 | 27211 | 27212 | 27213 | 27214 | 27215 | 27216 | 27585 | 27586 | 27587 | 27588 | 27589 | 27590 | 27591 | 27592 | 27593 | 27594 | 27595 | 27596 | 27597 | 27598 | 27599 | 27600 | 27601 | 27602 | 27603 | 27880 | 27881 | 27882 | 27883 | 27884 | 27885 | 27886 | 27887 | 27888 | 27889 | 27890 | 27891 | 27892 | 27893 | 27894 | 27895 | 27896 | 27897 | 27898 | 28046 | 28047 | 28048 | 28049 | 28050 | 28051 | 28052 | 28053 | 28054 | 28055 | 28056 | 28057 | 28058 | 28059 | 28060 | 28061 | 28062 | 28063 | 28064 | 28065 | 28066 | 28097 | 28245 | 28246 | 28247 | 28248 | 28249 | 28250 | 28251 | 28252 | 28253 | 28732 | 29981 | 29982 | 29983 | 29984 | 29985 | 29986 | 29987 | 29988 | 29989 | 29990 | 29991 | 29992 | 29993 | 29994 | 29995 | 29996 | 29997 | 29998 | 29999 | 30000 | 30001 | 30002 | 30003 | 30004 | 30005 | 30006 | 30012 | 30016 | 30945 | 31299 | 35223 | 35224 | 35225 | 35226 | 35227 | 35228 | 35229 | 35230 | 35231 | 35232 | 35233 | 35234 | 35235 | 35236 | 35237 | 35238 | 35239 | 35240 | 35241 | 35242 | 35243 | 35244 | 35245 | 35246 | 35247 | 35248 | 35249 | 35250 | 35251 | 35252 | 35253