Installed service/server uses new ICU chain definitions

diff --git a/etc/default.xml b/etc/default.xml
index 3decc28..6dc9cae 100644 (file)
--- a/etc/default.xml
+++ b/etc/default.xml
@@ -3,29 +3,28 @@
   <timeout session="60" z3950_operation="30" z3950_session="180"/>
   <settings src="settings/sru-test.xml"/>
   
-  <relevance>
-    <icu_chain id="relevance" locale="en">
-      <transform rule="[:Control:] Any-Remove"/>
-      <tokenize rule="l"/>
-      <transform rule="[[:WhiteSpace:][:Punctuation:]`] Remove"/>
-      <casemap rule="l"/>
-    </icu_chain>
-  </relevance>
+  <icu_chain id="relevance" locale="en">
+    <transform rule="[:Control:] Any-Remove"/>
+    <tokenize rule="l"/>
+    <transform rule="[[:WhiteSpace:][:Punctuation:]`] Remove"/>
+    <casemap rule="l"/>
+  </icu_chain>
   
-  <sort>
-    <icu_chain id="sort" locale="en">
-      <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
-      <casemap rule="l"/>
-    </icu_chain>
-  </sort>
+  <icu_chain id="sort" locale="en">
+    <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
+    <casemap rule="l"/>
+  </icu_chain>
   
-  <mergekey>
-    <icu_chain id="mergekey" locale="en">
-      <tokenize rule="l"/>
-      <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
-      <casemap rule="l"/>
-    </icu_chain>
-  </mergekey>
+  <icu_chain id="mergekey" locale="en">
+    <tokenize rule="l"/>
+    <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
+    <casemap rule="l"/>
+  </icu_chain>
+  
+  <icu_chain id="facet" locale="en">
+    <display/>
+    <transform rule="Title"/>
+  </icu_chain>
   
   <!-- we try to keep same order as in marc21.xsl -->
   <metadata name="id" brief="yes"/>

diff --git a/etc/server.xml b/etc/server.xml
index 617b9e8..d47a663 100644 (file)
--- a/etc/server.xml
+++ b/etc/server.xml
@@ -6,30 +6,29 @@
     <listen port="8004"/>
 
     <!-- character set mapping.. This can be overriden in services -->
-    <relevance>
-      <icu_chain id="relevance" locale="en">
-       <transform rule="[:Control:] Any-Remove"/>
-       <tokenize rule="l"/>
-       <transform rule="[[:WhiteSpace:][:Punctuation:]`] Remove"/>
-       <casemap rule="l"/>
-      </icu_chain>
-    </relevance>
+    <icu_chain id="relevance" locale="en">
+      <transform rule="[:Control:] Any-Remove"/>
+      <tokenize rule="l"/>
+      <transform rule="[[:WhiteSpace:][:Punctuation:]`] Remove"/>
+      <casemap rule="l"/>
+    </icu_chain>
     
-    <sort>
-      <icu_chain id="sort" locale="en">
-       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
-       <casemap rule="l"/>
-      </icu_chain>
-    </sort>
+    <icu_chain id="sort" locale="en">
+      <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
+      <casemap rule="l"/>
+    </icu_chain>
     
-    <mergekey>
-      <icu_chain id="mergekey" locale="en">
-       <tokenize rule="l"/>
-       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
-       <casemap rule="l"/>
-      </icu_chain>
-    </mergekey>
+    <icu_chain id="mergekey" locale="en">
+      <tokenize rule="l"/>
+      <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
+      <casemap rule="l"/>
+    </icu_chain>
 
+    <icu_chain id="facet" locale="en">
+      <display/>
+      <transform rule="Title"/>
+    </icu_chain>
+    
     <include src="services-enabled/*.xml"/>
 
   </server>