From 8dbbb9e74a00491ee8325d7b6a090c7e09940772 Mon Sep 17 00:00:00 2001
From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 16 May 2012 14:12:47 +0200
Subject: [PATCH] Update facet rule to implemented hardcoded punctuation trim

---
 test/test_facets.cfg         |   10 +++++++++-
 test/test_icu.cfg            |    2 +-
 test/test_limit_limitmap.cfg |    4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/test/test_facets.cfg b/test/test_facets.cfg
index 9fce24c..d1ae26e 100644
--- a/test/test_facets.cfg
+++ b/test/test_facets.cfg
@@ -5,6 +5,14 @@
     <listen port="9763"/>
     <proxy host="localhost"/>
     
+    <icu_chain id="punctuation-trim" locale="en">
+      <transliterate>[[:WhiteSpace:][,.-]]* } [$] > ;</transliterate>
+    </icu_chain>
+
+    <icu_chain id="facet" locale="en">
+      <transliterate>[[:WhiteSpace:][,.!;]]* } [$] > ;</transliterate>
+    </icu_chain>
+
     <service>
       <include src="z3950_indexdata_com_marc.xml"/>
       <metadata name="url" merge="unique"/>
@@ -13,7 +21,7 @@
       <metadata name="isbn"/>
       <metadata name="date" brief="yes" sortkey="numeric" type="year" merge="range"
 		termlist="yes"/>
-      <metadata name="author" brief="yes" termlist="yes" merge="longest" rank="2" mergekey="optional" />
+      <metadata name="author" brief="yes" termlist="yes" merge="longest" rank="2" mergekey="optional" facetrule="punctuation-trim" />
       <metadata name="subject" merge="unique" termlist="yes" rank="3"/>
       <metadata name="id"/>
       <metadata name="lccn" merge="unique"/>
diff --git a/test/test_icu.cfg b/test/test_icu.cfg
index fcab6fa..0d5be21 100644
--- a/test/test_icu.cfg
+++ b/test/test_icu.cfg
@@ -43,7 +43,7 @@
       <display/> 
 -->
       <transliterate>
-	[,]* } [$] > ;
+	[.,]* } [$] > ;
       </transliterate>
     </icu_chain>
 
diff --git a/test/test_limit_limitmap.cfg b/test/test_limit_limitmap.cfg
index 9b12a05..a8c2974 100644
--- a/test/test_limit_limitmap.cfg
+++ b/test/test_limit_limitmap.cfg
@@ -4,6 +4,10 @@
   <server>
     <listen port="9763"/>
     <proxy host="localhost"/>
+
+    <icu_chain id="facet" locale="en">
+      <transliterate>[[:WhiteSpace:][,.!;]]* } [$] > ;</transliterate>
+    </icu_chain>
   </server>
   
 </pazpar2>
-- 
1.7.10.4