From 0208c9d66100424e4186f895a9e3357ed1001140 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Wed, 15 Dec 2010 20:29:50 +0100 Subject: [PATCH] NormalizeString POD Fixing and variable renaming POD was mistakenly telling that NFD was supposed to be the default encoding. In fact, it is not, it is NFC. So the variable $nfc to change to the not default encoding was misleading. Renaming it into $nfd (written by hdl) Refactored by Chris Cormack Signed-off-by: Davi Signed-off-by: Chris Cormack (cherry picked from commit 4117b293f633597e74e3dda9e1e52810d31ad23d) Signed-off-by: Chris Nighswonger --- C4/Charset.pm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/C4/Charset.pm b/C4/Charset.pm index b3b4b722c3..712bd85ca8 100644 --- a/C4/Charset.pm +++ b/C4/Charset.pm @@ -33,6 +33,7 @@ BEGIN { require Exporter; @ISA = qw(Exporter); @EXPORT = qw( + NormalizeString IsStringUTF8ish MarcToUTF8Record SetUTF8Flag @@ -148,27 +149,28 @@ sub SetUTF8Flag{ =head2 NormalizeString - my $normalized_string=NormalizeString($string); + my $normalized_string=NormalizeString($string,$nfd,$transform); Given a string - -nfc : If you want to set NFC and not NFD +nfd : If you want to set NFD and not NFC transform : If you expect all the signs to be removed + Sets the PERL UTF8 Flag on your initial data if need be -and applies cleaning if required +and applies cleaning if required -Returns a utf8 NFD normalized string +Returns a utf8 NFC normalized string Sample code : - my $string=NormalizeString ("l'ornithoptère"); - #results into ornithoptère in NFD form and sets UTF8 Flag + my $string=NormalizeString ("l'ornithoptère"); + #results into ornithoptère in NFC form and sets UTF8 Flag =cut + sub NormalizeString{ - my ($string,$nfc,$transform)=@_; + my ($string,$nfd,$transform)=@_; utf8::decode($string) unless (utf8::is_utf8($string)); - if ($nfc){ + if ($nfd){ $string= NFD($string); } else { -- 2.39.5