X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_icu.cfg;h=b569ddfd0657b02f513bd13591fcb766ceee3cad;hb=cce5da278d7ce802452bbc14b4c2d577f638291b;hp=0c2883e83f741e4692b25c8b34c08ada068c4021;hpb=d7dc14dcdfbd1ecdc805a0d649203f3b9888749c;p=pazpar2-moved-to-github.git

diff --git a/test/test_icu.cfg b/test/test_icu.cfg
index 0c2883e..b569ddf 100644
--- a/test/test_icu.cfg
+++ b/test/test_icu.cfg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  <!-- $Id: test_icu.cfg,v 1.1 2007-09-10 16:25:51 adam Exp $ -->
   <!-- Used by test_http.sh -->
   <server>
     <listen port="9763"/>
@@ -8,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>
     
@@ -48,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>