From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 3 Mar 2014 15:05:16 +0000 (+0100)
Subject: Do not use deprecated ICU definitions
X-Git-Tag: v1.6.40~6
X-Git-Url: http://git.indexdata.com/?p=pazpar2-moved-to-github.git;a=commitdiff_plain;h=8d4173da146a250fe0363a2f26ae60796daa4067

Do not use deprecated ICU definitions
---

diff --git a/etc/services/long_sessions.xml b/etc/services/long_sessions.xml
index 046e816..1db2ab9 100644
--- a/etc/services/long_sessions.xml
+++ b/etc/services/long_sessions.xml
@@ -47,29 +47,23 @@
     <set name="pz:xslt" value="tmarc.xsl"/>
   </settings>
 
-  <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>
   
-  <sort>
     <icu_chain id="sort" locale="en">
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </sort>
   
-  <mergekey>
     <icu_chain id="mergekey" locale="en">
       <tokenize rule="l"/>
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </mergekey>
   
   <!-- we try to keep same order as in marc21.xsl -->
   <metadata name="id" brief="yes"/>
diff --git a/etc/services/perf.xml b/etc/services/perf.xml
index afdde2c..928ee1e 100644
--- a/etc/services/perf.xml
+++ b/etc/services/perf.xml
@@ -48,29 +48,23 @@
     <set name="pz:xslt" value="marc21.xsl"/>
   </settings>
 
-  <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>
   
-  <sort>
     <icu_chain id="sort" locale="en">
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </sort>
   
-  <mergekey>
     <icu_chain id="mergekey" locale="en">
       <tokenize rule="l"/>
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </mergekey>
   
   <!-- we try to keep same order as in marc21.xsl -->
   <metadata name="id" brief="yes"/>
diff --git a/etc/services/perf_opac_turbo.xml b/etc/services/perf_opac_turbo.xml
index 12945e0..7adec93 100644
--- a/etc/services/perf_opac_turbo.xml
+++ b/etc/services/perf_opac_turbo.xml
@@ -48,29 +48,23 @@
     <set name="pz:xslt" value="opac_turbomarc.xsl"/>
   </settings>
 
-  <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>
   
-  <sort>
     <icu_chain id="sort" locale="en">
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </sort>
   
-  <mergekey>
     <icu_chain id="mergekey" locale="en">
       <tokenize rule="l"/>
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </mergekey>
   
   <!-- we try to keep same order as in marc21.xsl -->
   <metadata name="id" brief="yes"/>
diff --git a/etc/services/perf_turbo.xml b/etc/services/perf_turbo.xml
index 85cb0f6..8a0a4d4 100644
--- a/etc/services/perf_turbo.xml
+++ b/etc/services/perf_turbo.xml
@@ -48,29 +48,23 @@
     <set name="pz:xslt" value="tmarc.xsl"/>
   </settings>
 
-  <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>
   
-  <sort>
     <icu_chain id="sort" locale="en">
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </sort>
   
-  <mergekey>
     <icu_chain id="mergekey" locale="en">
       <tokenize rule="l"/>
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </mergekey>
   
   <!-- default rule if not facetrule is defined on meta-data element -->
   <icu_chain id="facet" locale="en">
diff --git a/etc/services/perf_turbo_small.xml b/etc/services/perf_turbo_small.xml
index cb1bfda..decb565 100644
--- a/etc/services/perf_turbo_small.xml
+++ b/etc/services/perf_turbo_small.xml
@@ -32,29 +32,23 @@
     <set name="pz:xslt" value="tmarc.xsl"/>
   </settings>
 
-  <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>
   
-  <sort>
     <icu_chain id="sort" locale="en">
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </sort>
   
-  <mergekey>
     <icu_chain id="mergekey" locale="en">
       <tokenize rule="l"/>
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </mergekey>
   
   <!-- we try to keep same order as in marc21.xsl -->
   <metadata name="id" brief="yes"/>
diff --git a/etc/services/solr.xml b/etc/services/solr.xml
index 829120e..55841b2 100644
--- a/etc/services/solr.xml
+++ b/etc/services/solr.xml
@@ -35,29 +35,23 @@
     <set name="pz:xslt" value="solr-ps2.xsl"/>
   </settings>
 
-  <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>
   
-  <sort>
     <icu_chain id="sort" locale="en">
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </sort>
   
-  <mergekey>
     <icu_chain id="mergekey" locale="en">
       <tokenize rule="l"/>
       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
       <casemap rule="l"/>
     </icu_chain>
-  </mergekey>
   
   <!-- we try to keep same order as in marc21.xsl -->
   <metadata name="id" brief="yes"/>