I hate failed merges

[pazpar2-moved-to-github.git] / test / test_icu.cfg

diff --git a/test/test_icu.cfg b/test/test_icu.cfg
index cd709b7..b569ddf 100644 (file)
--- a/test/test_icu.cfg
+++ b/test/test_icu.cfg
@@ -7,28 +7,25 @@
     
     <relevance>
       <icu_chain id="relevance" locale="el">
-       <normalize rule="[:Control:] Any-Remove"/>
+       <transform rule="[:Control:] Any-Remove"/>
        <tokenize rule="l"/>
-       <normalize rule="[[:WhiteSpace:][:Punctuation:]] Remove"/>
+       <transform rule="[[:WhiteSpace:][:Punctuation:]] Remove"/>
        <casemap rule="l"/>
-       <index/>
       </icu_chain>
     </relevance>
 
     <sort>
       <icu_chain id="sort" locale="el">
-       <normalize rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
+       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
        <casemap rule="l"/>
-       <sortkey/>
       </icu_chain>
     </sort>
     
     <mergekey>
       <icu_chain id="mergekey" locale="el">
        <tokenize rule="l"/>
-       <normalize rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
+       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
        <casemap rule="l"/>
-       <index/>
       </icu_chain>
     </mergekey>
     
@@ -47,7 +44,7 @@
       
       <metadata name="test-usersetting" brief="yes" setting="postproc"/>
       <metadata name="test" setting="parameter"/>
-      <metadata name="test_usersetting_2" brief="yes"/>
+      <metadata name="test-usersetting-2" brief="yes"/>
     </service>
   </server>