[Koha-patches] [PATCH] [SIGNED-OFF] NormalizeString POD Fixing and variable renaming

[davi at gnu.org]

From 47c5e13138fd1943cde07d7893cff191cad8e6a6 Mon Sep 17 00:00:00 2001
From: Paul Poulain <paul.poulain at biblibre.com>
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 <davi at gnu.org>
---
 C4/Charset.pm |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/C4/Charset.pm b/C4/Charset.pm
index b3b4b72..712bd85 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 {
-- 
1.7.2.3