From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 25 Dec 2008 14:20:45 +0000 (+0100)
Subject: Function icu_chain_xml_config allows certain obsolete elements.
X-Git-Tag: v3.0.40~12
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=68398183c3b25120b484681482f461a1da4c6a36

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.
---

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;
 }