X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ficu_I18N.c;h=4e9dcf74ef7327d23291de566f40cfa8bac400d5;hb=e089d89f38b4fc61fce16eb03150776844b053f8;hp=1f309900f8a3af2946a89bf9adaa05429fe863da;hpb=71509ab1affd957fa0af7c7536105988a7ccd93d;p=yaz-moved-to-github.git

diff --git a/src/icu_I18N.c b/src/icu_I18N.c
index 1f30990..4e9dcf7 100644
--- 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.11 2007-11-06 10:27:30 adam Exp $
+ * $Id: icu_I18N.c,v 1.14 2007-11-08 13:35:13 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -15,7 +15,7 @@
 #endif
 
 
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
 #include <yaz/icu_I18N.h>
 
 #include <yaz/log.h>
@@ -267,6 +267,7 @@ UErrorCode icu_utf16_from_utf8_cstr(struct icu_buf_utf16 * dest16,
     size_t src8cstr_len = 0;
     int32_t utf16_len = 0;
 
+    *status = U_ZERO_ERROR;
     src8cstr_len = strlen(src8cstr);
   
     u_strFromUTF8(dest16->utf16, dest16->utf16_cap,
@@ -332,7 +333,6 @@ struct icu_casemap * icu_casemap_create(const char *locale, char action,
 {    
     struct icu_casemap * casemap
         = (struct icu_casemap *) malloc(sizeof(struct icu_casemap));
-    strcpy(casemap->locale, locale);
     casemap->action = action;
 
     switch(casemap->action) {    
@@ -355,7 +355,7 @@ struct icu_casemap * icu_casemap_create(const char *locale, char action,
 
 void icu_casemap_destroy(struct icu_casemap * casemap)
 {
-    if (casemap) 
+    if (casemap)
         free(casemap);
 }
 
@@ -363,13 +363,14 @@ void icu_casemap_destroy(struct icu_casemap * casemap)
 int icu_casemap_casemap(struct icu_casemap * casemap,
                         struct icu_buf_utf16 * dest16,
                         struct icu_buf_utf16 * src16,
-                        UErrorCode *status)
+                        UErrorCode *status,
+                        const char *locale)
 {
     if(!casemap)
         return 0;
     
-    return icu_utf16_casemap(dest16, src16,
-                             casemap->locale, casemap->action, status);
+    return icu_utf16_casemap(dest16, src16, locale,
+                             casemap->action, status);
 }
 
 
@@ -858,6 +859,8 @@ struct icu_chain * icu_chain_create(const char *locale,
     struct icu_chain * chain 
         = (struct icu_chain *) malloc(sizeof(struct icu_chain));
 
+    *status = U_ZERO_ERROR;
+
     strncpy((char *) chain->locale, (const char *) locale, 16);    
     chain->locale[16 - 1] = '\0';
 
@@ -906,26 +909,31 @@ void icu_chain_destroy(struct icu_chain * chain)
 
 
 struct icu_chain * icu_chain_xml_config(const xmlNode *xml_node, 
-                                        const char *locale, 
                                         int sort,
-                                        UErrorCode * status){
-
+                                        UErrorCode * status)
+{
     xmlNode *node = 0;
     struct icu_chain * chain = 0;
    
-    if (!xml_node 
-        ||xml_node->type != XML_ELEMENT_NODE 
-        // || strcmp((const char *) xml_node->name, "icu_chain")
-        )
+    *status = U_ZERO_ERROR;
 
+    if (!xml_node ||xml_node->type != XML_ELEMENT_NODE)
         return 0;
-
-        chain = icu_chain_create(locale, sort, status);
-
+    
+    {
+        xmlChar * xml_locale = xmlGetProp((xmlNode *) xml_node, 
+                                          (xmlChar *) "locale");
+        
+        if (xml_locale)
+        {
+            chain = icu_chain_create((const char *) xml_locale, sort, status);
+            xmlFree(xml_locale);
+        }
+        
+    }
     if (!chain)
         return 0;
 
-        
     for (node = xml_node->children; node; node = node->next)
     {
         xmlChar *xml_rule;
@@ -1067,7 +1075,8 @@ int icu_chain_step_next_token(struct icu_chain * chain,
         break;
     case ICU_chain_step_type_casemap:
         icu_casemap_casemap(step->u.casemap,
-                            step->buf16, src16, status);
+                            step->buf16, src16, status,
+                            chain->locale);
         break;
     case ICU_chain_step_type_normalize:
         icu_normalizer_normalize(step->u.normalizer,
@@ -1151,6 +1160,8 @@ int icu_chain_next_token(struct icu_chain * chain,
 {
     int got_token = 0;
     
+    *status = U_ZERO_ERROR;
+
     if (!chain)
         return 0;
 
@@ -1233,9 +1244,7 @@ const UCollator * icu_chain_get_coll(struct icu_chain * chain)
 }
 
 
-
-
-#endif /* HAVE_ICU */
+#endif /* YAZ_HAVE_ICU */