X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_icu.cfg;h=0d5cd40eaede45c7f6209f315f63b528cd804031;hb=f55fc6fe7aa50cb0d8a400787d28edc2c4a91040;hp=b51dafa98468fe7f64c6338e3f913e26b8fc80c4;hpb=77682ed3596450ab7b3caff707999d2f7977d614;p=pazpar2-moved-to-github.git

diff --git a/test/test_icu.cfg b/test/test_icu.cfg
index b51dafa..0d5cd40 100644
--- a/test/test_icu.cfg
+++ b/test/test_icu.cfg
@@ -18,20 +18,24 @@
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-    
-    <icu_chain id="mergekey" locale="en">
-      <tokenize rule="l"/>
-      <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
-      <casemap rule="l"/>
-    </icu_chain>
+
+    <mergekey><!-- the deprecated format -->    
+      <icu_chain locale="en">
+        <tokenize rule="l"/>
+        <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
+        <casemap rule="l"/>
+      </icu_chain>
+    </mergekey>
     
     <icu_chain id="facet" locale="en">
       <transliterate>[[:WhiteSpace:][,.!;]]* } [$] > ;</transliterate>
     </icu_chain>
 
     <icu_chain id="mychain" locale="en">
+      <transliterate>[$] { [[:WhiteSpace:][,.!;]]* > ;</transliterate>
+      <transliterate>[[:WhiteSpace:][,.!;]]* } [$] > ;</transliterate>
       <display/>
-      <transform rule="[[:WhiteSpace:][:Punctuation:]] Remove"/>
+      <casemap rule="l"/>
     </icu_chain>
 
     <icu_chain id="facet-author" locale="en">
@@ -54,7 +58,7 @@
       <metadata name="subject" merge="unique" termlist="yes" rank="3"/>
       <metadata name="id"/>
       <metadata name="lccn" merge="unique"/>
-      <metadata name="description" brief="yes" merge="longest" rank="3"/>
+      <metadata name="description" brief="yes" merge="longest" rank="3" icurule="mychain"/>
       
       <metadata name="test-usersetting" brief="yes" setting="postproc"/>
       <metadata name="test" setting="parameter"/>