From c11cdf747bc07a51d8947c2c82ec003a3f9aa282 Mon Sep 17 00:00:00 2001
From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 16 May 2012 14:24:49 +0200
Subject: [PATCH] Add default ICU chain "facet" to produce the same as removed
 hardcoded punctuation trim

---
 test/test_filter.cfg |    6 ++++++
 test/test_icu.cfg    |    7 ++-----
 test/test_solr.cfg   |    6 ++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/test/test_filter.cfg b/test/test_filter.cfg
index 6f07275..afa0e19 100644
--- a/test/test_filter.cfg
+++ b/test/test_filter.cfg
@@ -3,6 +3,12 @@
   <!-- Used by test_filter.sh -->
   <server>
     <listen port="9763"/>
+
+    <!-- same as hardcoded rule -->
+    <icu_chain id="facet" locale="en">
+      <transliterate>[[:WhiteSpace:][,.!;]]* } [$] > ;</transliterate>
+    </icu_chain>
+
     <service>
       <settings target="*">
         <set target="localhost:9999/Slow" name="pz:name" value="ztest slow"/>
diff --git a/test/test_icu.cfg b/test/test_icu.cfg
index 0d5be21..d3d451e 100644
--- a/test/test_icu.cfg
+++ b/test/test_icu.cfg
@@ -39,11 +39,8 @@
     </icu_chain>
 
     <icu_chain id="facet-author" locale="en">
-<!--
-      <display/> 
--->
       <transliterate>
-	[.,]* } [$] > ;
+	[,]* } [$] > ;
       </transliterate>
     </icu_chain>
 
@@ -56,7 +53,7 @@
       <metadata name="date" brief="yes" sortkey="numeric" type="year" merge="range"
 		termlist="yes"/>
       <metadata name="author" brief="yes" termlist="yes"
-                merge="longest" rank="2" facetrule="facet-author"/>
+                merge="longest" rank="2" facetrule="facet-author" />
       <metadata name="subject" merge="unique" termlist="yes" rank="3"/>
       <metadata name="id"/>
       <metadata name="lccn" merge="unique"/>
diff --git a/test/test_solr.cfg b/test/test_solr.cfg
index 1c30567..81d1680 100644
--- a/test/test_solr.cfg
+++ b/test/test_solr.cfg
@@ -4,6 +4,12 @@
   <server>
     <listen port="9763"/>
     
+    <!-- same as hardcoded rule -->
+    <icu_chain id="facet" locale="en">
+      <transliterate>[[:WhiteSpace:][,.!;]]* } [$] > ;</transliterate>
+    </icu_chain>
+
+    
     <service>
       <metadata name="url" merge="unique"/>
       <metadata name="title" brief="yes" sortkey="skiparticle" merge="longest" rank="6" mergekey="required" />
-- 
1.7.10.4