From f32b0e1243c0d93f42f9385285c3217e70ba7b2a Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Delaune?= <stephane.delaune@biblibre.com>
Date: Wed, 20 Mar 2013 10:54:46 +0100
Subject: [PATCH] Bug 9859: fix nsb_clean side effect
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
This sub was causing 2 bugs :
- tools/exports.pl --clean was removing Â
- authority search plugin used in cataloging was removing  in suggested authorities displayed dynamicly (using ajax)
After applying the patch,
- NSB/NSE are still removed by nsb_clean
- tools/exports.pl --clean is no more removing Â
- authority search plugins is no more removing Â

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 C4/Charset.pm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/C4/Charset.pm b/C4/Charset.pm
index 2950a71a8b..9be97882f0 100644
--- a/C4/Charset.pm
+++ b/C4/Charset.pm
@@ -415,11 +415,8 @@ sub nsb_clean {
     # handles non sorting blocks
     my ($string) = @_ ;
     $_ = $string ;
-    s/$NSB//g ;
-    s/$NSE//g ;
-    s/$NSB2//g ;
-    s/$NSE2//g ;
-    s/$C2//g ;
+    s/($C2){0,1}($NSB|$NSB2)//g ;
+    s/($C2){0,1}($NSE|$NSE2)//g ;
     $string = $_ ;
 
     return($string) ;
-- 
2.20.1