X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=test%2Ftest_icu.cfg;h=0d5cd40eaede45c7f6209f315f63b528cd804031;hb=4ae1e0582f66acaec33dca2c3b023d47d7f431af;hp=85a1b1c152e602183dcf2d7818f71bd0e9972000;hpb=7b61a146be4cb5a371d87cfab5c24fc87082b7cd;p=pazpar2-moved-to-github.git

diff --git a/test/test_icu.cfg b/test/test_icu.cfg
index 85a1b1c..0d5cd40 100644
--- a/test/test_icu.cfg
+++ b/test/test_icu.cfg
@@ -6,36 +6,36 @@
     <proxy host="localhost"/>
     <settings src="z3950_indexdata_com_marc.xml"/>
     
-    <relevance>
-      <icu_chain locale="en">
-	<transform rule="[:Control:] Any-Remove"/>
-	<tokenize rule="l"/>
-	<transform rule="[[:WhiteSpace:][:Punctuation:]] Remove"/>
-	<casemap rule="l"/>
-	<stemming rule="english" />
-      </icu_chain>
-    </relevance>
-
-    <sort>
-      <icu_chain locale="en">
-	<transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
-	<casemap rule="l"/>
-      </icu_chain>
-    </sort>
-    
-    <icu_chain id="mergekey" locale="en">
+    <icu_chain id="relevance" locale="en">
+      <transform rule="[:Control:] Any-Remove"/>
       <tokenize rule="l"/>
+      <transform rule="[[:WhiteSpace:][:Punctuation:]] Remove"/>
+      <casemap rule="l"/>
+      <stemming rule="english" />
+    </icu_chain>
+
+    <icu_chain id="sort" locale="en">
       <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">
@@ -58,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"/>