X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ficu_chain.c;h=a318e6415e2422a901070401fbf72de5136ffe9b;hb=fcb40f9ed16ce6a8ef86997890057af0f7692377;hp=de2e627c6ac5e980c87b807242f98b574422e6a7;hpb=94b1547e5951e1e01bf5180159e74095cd0527f4;p=yaz-moved-to-github.git diff --git a/src/icu_chain.c b/src/icu_chain.c index de2e627..a318e64 100644 --- a/src/icu_chain.c +++ b/src/icu_chain.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2013 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -250,13 +251,10 @@ struct icu_chain *icu_chain_xml_config(const xmlNode *xml_node, if (xml_node && xml_node->type == XML_ELEMENT_NODE) { - xmlChar *xml_locale = xmlGetProp((xmlNode *) xml_node, - (xmlChar *) "locale"); + const char *xml_locale = yaz_xml_get_prop((xmlNode *) xml_node, + "locale"); if (xml_locale) - { chain = icu_chain_create((const char *) xml_locale, sort, status); - xmlFree(xml_locale); - } } if (!chain) @@ -267,31 +265,24 @@ struct icu_chain *icu_chain_xml_config(const xmlNode *xml_node, { char *rule = 0; struct icu_chain_step *step = 0; - struct _xmlAttr *attr; + const char *attr_str; nmem_reset(nmem); if (node->type != XML_ELEMENT_NODE) continue; - - for (attr = node->properties; attr; attr = attr->next) + attr_str = yaz_xml_get_prop(node, "rule%s", &rule); + if (attr_str) { - if (!strcmp((const char *) attr->name, "rule")) - { - rule = nmem_text_node_cdata(attr->children, nmem); - } - else - { - yaz_log(YLOG_WARN, "Unsupported attribute '%s' for " - "element '%s'", attr->name, node->name); - no_errors++; - } + yaz_log(YLOG_WARN, "Unsupported attribute '%s' for " + "element '%s'", attr_str, node->name); + no_errors++; } if (!rule && node->children) rule = nmem_text_node_cdata(node->children, nmem); if (!rule && strcmp((const char *) node->name, "display")) { - yaz_log(YLOG_WARN, "Missing attribute rule for element %s", + yaz_log(YLOG_WARN, "Missing attribute 'rule' for element %s", (const char *) node->name); no_errors++; continue; @@ -346,6 +337,9 @@ struct icu_chain *icu_chain_xml_config(const xmlNode *xml_node, } if (step && U_FAILURE(*status)) { + yaz_log(YLOG_WARN, "ICU Error %d %s for element %s, rule %s", + *status, u_errorName(*status), node->name, rule ? + rule : ""); no_errors++; break; } @@ -362,14 +356,17 @@ struct icu_chain *icu_chain_xml_config(const xmlNode *xml_node, struct icu_iter { struct icu_chain *chain; struct icu_buf_utf16 *last; + struct icu_buf_utf16 *org; + struct icu_buf_utf8 *org8; UErrorCode status; struct icu_buf_utf8 *display; struct icu_buf_utf8 *sort8; struct icu_buf_utf8 *result; - struct icu_buf_utf16 *input; int token_count; size_t org_start; size_t org_len; + size_t utf8_base; + size_t utf16_base; struct icu_chain_step *steps; }; @@ -421,6 +418,11 @@ struct icu_buf_utf16 *icu_iter_invoke(yaz_icu_iter_t iter, struct icu_buf_utf16 *src = dst; icu_tokenizer_attach(step->u.tokenizer, src, &iter->status); + if (step->previous) + { /* no need to copy if it's already the same */ + iter->utf8_base = iter->utf16_base = 0; + icu_buf_utf16_copy(iter->org, src); + } icu_buf_utf16_destroy(src); } dst = icu_buf_utf16_create(0); @@ -486,24 +488,25 @@ yaz_icu_iter_t icu_iter_create(struct icu_chain *chain) iter->display = icu_buf_utf8_create(0); iter->sort8 = icu_buf_utf8_create(0); iter->result = icu_buf_utf8_create(0); + iter->org = icu_buf_utf16_create(0); + iter->org8 = 0; iter->last = 0; /* no last returned string (yet) */ iter->steps = icu_chain_step_clone(chain->csteps); - iter->input = 0; + iter->token_count = 0; return iter; } void icu_iter_first(yaz_icu_iter_t iter, const char *src8cstr) { - if (iter->input) - icu_buf_utf16_destroy(iter->input); - iter->input = icu_buf_utf16_create(0); + struct icu_buf_utf16 *src = icu_buf_utf16_create(0); + icu_utf16_from_utf8_cstr(src, src8cstr, &iter->status); + icu_buf_utf16_copy(iter->org, src); iter->token_count = 0; - /* fill and assign input string.. It will be 0 after - first iteration */ - icu_utf16_from_utf8_cstr(iter->input, src8cstr, &iter->status); iter->org_start = 0; - iter->org_len = iter->input->utf16_len; + iter->utf8_base = iter->utf16_base = 0; + iter->org_len = src->utf16_len; + iter->last = icu_iter_invoke(iter, iter->steps, src); } void icu_iter_destroy(yaz_icu_iter_t iter) @@ -513,8 +516,8 @@ void icu_iter_destroy(yaz_icu_iter_t iter) icu_buf_utf8_destroy(iter->display); icu_buf_utf8_destroy(iter->sort8); icu_buf_utf8_destroy(iter->result); - if (iter->input) - icu_buf_utf16_destroy(iter->input); + icu_buf_utf16_destroy(iter->org); + icu_buf_utf8_destroy(iter->org8); icu_chain_step_destroy(iter->steps); xfree(iter); } @@ -522,20 +525,13 @@ void icu_iter_destroy(yaz_icu_iter_t iter) int icu_iter_next(yaz_icu_iter_t iter) { - if (!iter->input && iter->last == 0) + if (iter->token_count && iter->last) + iter->last = icu_iter_invoke(iter, iter->steps, 0); + if (!iter->last) return 0; else { - /* on first call, iter->input is the input string. Thereafter: 0. */ - assert(iter->steps || !iter->chain->csteps); - iter->last = icu_iter_invoke(iter, iter->steps, iter->input); - iter->input = 0; - - if (!iter->last) - return 0; - iter->token_count++; - if (iter->chain->sort) { icu_sortkey8_from_utf16(iter->chain->coll, @@ -570,10 +566,48 @@ int icu_iter_get_token_number(yaz_icu_iter_t iter) } +void icu_iter_get_org_info2(yaz_icu_iter_t iter, size_t *start, size_t *len, + const char **cstr) +{ + int32_t len1 = 0, len2 = 0; + UErrorCode status = U_ZERO_ERROR; + + if (iter->org_start < iter->utf16_base) + { + iter->utf8_base = 0; + iter->utf16_base = 0; + } + u_strToUTF8(0, 0, &len1, + iter->org->utf16 + iter->utf16_base, + iter->org_start - iter->utf16_base, + &status); + + status = U_ZERO_ERROR; + + *start = len1 + iter->utf8_base; + + u_strToUTF8(0, 0, &len2, + iter->org->utf16 + iter->utf16_base, + iter->org_start - iter->utf16_base + iter->org_len, + &status); + + *len = len2 - len1; + + if (cstr) + { + if (!iter->org8) + iter->org8 = icu_buf_utf8_create(0); + status = U_ZERO_ERROR; + icu_utf16_to_utf8(iter->org8, iter->org, &status); + *cstr = icu_buf_utf8_to_cstr(iter->org8); + } + iter->utf8_base = *start; + iter->utf16_base = iter->org_start; +} + void icu_iter_get_org_info(yaz_icu_iter_t iter, size_t *start, size_t *len) { - *start = iter->org_start; - *len = iter->org_len; + icu_iter_get_org_info2(iter, start, len, 0); } int icu_chain_assign_cstr(struct icu_chain *chain, const char *src8cstr, @@ -626,6 +660,13 @@ void icu_chain_get_org_info(struct icu_chain *chain, size_t *start, size_t *len) icu_iter_get_org_info(chain->iter, start, len); } +void icu_chain_get_org_info2(struct icu_chain *chain, size_t *start, + size_t *len, const char **cstr) +{ + if (chain->iter) + icu_iter_get_org_info2(chain->iter, start, len, cstr); +} + #endif /* YAZ_HAVE_ICU */