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

diff --git a/test/test_icu.cfg b/test/test_icu.cfg
index fcab6fa..0d5cd40 100644
--- a/test/test_icu.cfg
+++ b/test/test_icu.cfg
@@ -6,42 +6,39 @@
     <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">
-<!--
-      <display/> 
--->
       <transliterate>
 	[,]* } [$] > ;
       </transliterate>
@@ -49,6 +46,7 @@
 
     <service>
       <timeout session="30" z3950_operation="20" z3950_session="40"/>
+      <rank debug="yes"/>
       <metadata name="url" merge="unique"/>
       <metadata name="title" brief="yes" sortkey="skiparticle" merge="longest" rank="6"/>
       <metadata name="title-remainder" brief="yes" merge="longest" rank="5"/>
@@ -56,11 +54,11 @@
       <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"/>
-      <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"/>