Attachment 28053 Details for Bug 11944 – Bug 11944: Remove obsolete encoding routines

[patch] Bug 11944: Remove obsolete encoding routines

Bug-11944-Remove-obsolete-encoding-routines.patch (text/plain), 2.31 KB, created by Jonathan Druart on 2014-05-08 10:18:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-05-08 10:18:10 UTC

Size: 2.31 KB

patch

obsolete

>From 422653b9d46cdba4248f81ba2c3c65c5804e830f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Fri, 14 Mar 2014 17:22:27 +0100
>Subject: [PATCH] Bug 11944: Remove obsolete encoding routines
>
>We don't need to decode manually which provide nice performance boost.
>
>Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
>
>Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>---
> C4/Templates.pm |   42 +-----------------------------------------
> 1 file changed, 1 insertion(+), 41 deletions(-)
>
>diff --git a/C4/Templates.pm b/C4/Templates.pm
>index cf18140..7b9fd41 100644
>--- a/C4/Templates.pm
>+++ b/C4/Templates.pm
>@@ -115,19 +115,10 @@ sub output {
>         C4::Context->preference('opaclayoutstylesheet');
> 
>     # add variables set via param to $vars for processing
>-    # and clean any utf8 mess
>     for my $k ( keys %{ $self->{VARS} } ) {
>         $vars->{$k} = $self->{VARS}->{$k};
>-        if (ref($vars->{$k}) eq 'ARRAY'){
>-            utf8_arrayref($vars->{$k});
>-        }
>-        elsif (ref($vars->{$k}) eq 'HASH'){
>-            utf8_hashref($vars->{$k});
>-        }
>-        else {
>-            utf8::encode($vars->{$k}) if utf8::is_utf8($vars->{$k});
>-        }
>     }
>+
>     my $data;
>     binmode( STDOUT, ":utf8" );
>     $template->process( $self->filename, $vars, \$data )
>@@ -135,37 +126,6 @@ sub output {
>     return $data;
> }
> 
>-sub utf8_arrayref {
>-    my $arrayref = shift;
>-    foreach my $element (@$arrayref){
>-        if (ref($element) eq 'ARRAY'){
>-            utf8_arrayref($element);
>-            next;
>-        }
>-        if (ref($element) eq 'HASH'){
>-            utf8_hashref($element);
>-            next;
>-        }
>-        utf8::encode($element) if utf8::is_utf8($element);
>-    }        
>-}         
>-
>-sub utf8_hashref {
>-    my $hashref = shift;
>-    for my $key (keys %{$hashref}){
>-        if (ref($hashref->{$key}) eq 'ARRAY'){
>-            utf8_arrayref($hashref->{$key});
>-            next;
>-        }
>-        if (ref($hashref->{$key}) eq 'HASH'){
>-            utf8_hashref($hashref->{$key});
>-            next;
>-        }
>-        utf8::encode($hashref->{$key}) if utf8::is_utf8($hashref->{$key});
>-    }
>-}
>-        
>-        
> # FIXME - this is a horrible hack to cache
> # the current known-good language, temporarily
> # put in place to resolve bug 4403.  It is
>-- 
>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