Renamed 'normalize' rule to 'transform'.

The ICU chain step, normalize is now called transform because
that's what ICU calls it. And we better keep things aligned.

diff --git a/src/icu_I18N.c b/src/icu_I18N.c
index 5e32d6b..7809d2d 100644 (file)
--- a/src/icu_I18N.c
+++ b/src/icu_I18N.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: icu_I18N.c,v 1.19 2007-11-08 18:02:04 adam Exp $
+ * $Id: icu_I18N.c,v 1.20 2007-11-12 11:11:16 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -922,7 +922,7 @@ struct icu_chain * icu_chain_xml_config(const xmlNode *xml_node,
         if (!strcmp((const char *) node->name, "casemap"))
             step = icu_chain_insert_step(chain, ICU_chain_step_type_casemap, 
                                          (const uint8_t *) xml_rule, status);
-        else if (!strcmp((const char *) node->name, "normalize"))
+        else if (!strcmp((const char *) node->name, "transform"))
             step = icu_chain_insert_step(chain, ICU_chain_step_type_normalize, 
                                          (const uint8_t *) xml_rule, status);
         else if (!strcmp((const char *) node->name, "tokenize"))

diff --git a/test/tst_icu_I18N.c b/test/tst_icu_I18N.c
index c58ac85..4bef665 100644 (file)
--- a/test/tst_icu_I18N.c
+++ b/test/tst_icu_I18N.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2005-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tst_icu_I18N.c,v 1.14 2007-11-08 13:35:14 adam Exp $
+ * $Id: tst_icu_I18N.c,v 1.15 2007-11-12 11:11:16 adam Exp $
  *
  */
 
@@ -481,9 +481,9 @@ void test_icu_I18N_chain(int argc, char **argv)
     
 
     const char * xml_str = "<icu locale=\"en\">"
-        "<normalize rule=\"[:Control:] Any-Remove\"/>"
+        "<transform rule=\"[:Control:] Any-Remove\"/>"
         "<tokenize rule=\"l\"/>"
-        "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
+        "<transform rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
         "<display/>"
         "<casemap rule=\"l\"/>"
         "</icu>";
@@ -537,10 +537,10 @@ void test_bug_1140(void)
 
         /* if the first rule is normalize instead. Then it works */
 #if 0
-        "<normalize rule=\"[:Control:] Any-Remove\"/>"
+        "<transform rule=\"[:Control:] Any-Remove\"/>"
 #endif
         "<tokenize rule=\"l\"/>"
-        "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
+        "<transform rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
         "<display/>"
         "<casemap rule=\"l\"/>"
         "</icu>";
@@ -596,7 +596,7 @@ void test_chain_empty_token(void)
 
     const char * xml_str = "<icu locale=\"en\">"
         "<tokenize rule=\"w\"/>"
-        "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
+        "<transform rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
         "</icu>";
     
     xmlDoc *doc = xmlParseMemory(xml_str, strlen(xml_str));

diff --git a/util/yaz-icu.c b/util/yaz-icu.c
index 00b390d..d11683c 100644 (file)
--- a/util/yaz-icu.c
+++ b/util/yaz-icu.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: yaz-icu.c,v 1.12 2007-11-08 18:02:04 adam Exp $
+ * $Id: yaz-icu.c,v 1.13 2007-11-12 11:11:16 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -53,10 +53,10 @@ void print_option_error(const struct config_t *p_config)
             "./yaz-icu -p t -x\n"
             "\n"
             "Example ICU chain XML configuration file:\n"
-            "<icu_chain id=\"en:word\" locale=\"en\">\n"
-            "  <normalize rule=\"[:Control:] Any-Remove\"/>\n"
+            "<icu_chain locale=\"en\">\n"
+            "  <transform rule=\"[:Control:] Any-Remove\"/>\n"
             "  <tokenize rule=\"l\"/>\n"
-            "  <normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>\n"
+            "  <transform rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>\n"
             "  <casemap rule=\"l\"/>\n"
             "</icu_chain>\n"
           );