From 68398183c3b25120b484681482f461a1da4c6a36 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 25 Dec 2008 15:20:45 +0100 Subject: [PATCH] Function icu_chain_xml_config allows certain obsolete elements. Function icu_chain_xml_config allows certain obsolete elements which was present in first version of ICU wrapper made for Pazpar2. The elements 'index' and 'sortkey' are ignored and a warning is issued. The element 'normalize' behaves as 'transform' but a warning is issued. --- src/icu_I18N.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/icu_I18N.c b/src/icu_I18N.c index d3f8a4b..b2119b6 100644 --- a/src/icu_I18N.c +++ b/src/icu_I18N.c @@ -914,14 +914,31 @@ struct icu_chain * icu_chain_xml_config(const xmlNode *xml_node, else if (!strcmp((const char *) node->name, "display")) step = icu_chain_insert_step(chain, ICU_chain_step_type_display, (const uint8_t *) "", status); + else if (!strcmp((const char *) node->name, "normalize")) + { + yaz_log(YLOG_WARN, "Element %s is deprecated. " + "Use transform instead", node->name); + step = icu_chain_insert_step(chain, ICU_chain_step_type_normalize, + (const uint8_t *) xml_rule, status); + } + else if (!strcmp((const char *) node->name, "index") + || !strcmp((const char *) node->name, "sortkey")) + { + yaz_log(YLOG_WARN, "Element %s is no longer needed. " + "Remove it from the configuration", node->name); + } + else + { + yaz_log(YLOG_WARN, "Unknown element %s", node->name); + icu_chain_destroy(chain); + return 0; + } xmlFree(xml_rule); - if (!step || U_FAILURE(*status)) + if (step && U_FAILURE(*status)) { icu_chain_destroy(chain); return 0; } - - } return chain; } -- 1.7.10.4