Updated ICU config and adjusted description a little.

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index cc45924..931bc3f 100644 (file)
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -105,14 +105,14 @@
      <term>relevance</term>
      <listitem>
       <para>
-       Specifies ICU tokenization and normalization rules
+       Specifies ICU tokenization and transformation rules
        for tokens that are used in Pazpar2's relevance ranking.  The 'id'
        attribute is currently not used, and the 'locale'
        attribute must be set to one of the locale strings
        defined in ICU. The child elements listed below can be
        in any order, except the 'index' element which logically
        belongs to the end of the list. The stated tokenization,
-       normalization and charmapping instructions are performed
+       transformation and charmapping instructions are performed
        in order from top to bottom. 
       </para>
       <variablelist> <!-- Level 2 -->
@@ -160,7 +160,7 @@
      <term>sort</term>
      <listitem>
       <para>
-       Specifies ICU tokenization and normalization rules
+       Specifies ICU tokenization and transformation rules
        for tokens that are used in Pazpar2's sorting. The contents
        is similar to that of <literal>relevance</literal>.
       </para>
@@ -171,7 +171,7 @@
      <term>mergekey</term>
      <listitem>
       <para>
-       Specifies ICU tokenization and normalization rules
+       Specifies ICU tokenization and transformation rules
        for tokens that are used in Pazpar2's mergekey. The contents
        is similar to that of <literal>relevance</literal>.
       </para>
@@ -832,14 +832,14 @@
  </refsect1>
  <refsect1><title>SEE ALSO</title>
   <para>
-   Pazpar2:
    <citerefentry>
     <refentrytitle>pazpar2</refentrytitle>
     <manvolnum>8</manvolnum>
    </citerefentry>
-  </para>
-  <para>
-   Pazpar2 protocol:
+   <citerefentry>
+    <refentrytitle>yaz-icu</refentrytitle>
+    <manvolnum>1</manvolnum>
+   </citerefentry>
    <citerefentry>
     <refentrytitle>pazpar2_protocol</refentrytitle>
     <manvolnum>7</manvolnum>

diff --git a/etc/pazpar2.cfg.dist b/etc/pazpar2.cfg.dist
index 993df7f..f8e36be 100644 (file)
--- a/etc/pazpar2.cfg.dist
+++ b/etc/pazpar2.cfg.dist
@@ -8,28 +8,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>
     

diff --git a/test/test_icu.cfg b/test/test_icu.cfg
index 9235092..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>