X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ficu_chain.c;h=e7b9b4e9811f005d10acb732d43adbc32d814e08;hp=7bf81095bd92de9d5fe682d7005d1ef4bcc1909a;hb=8e4840a9a7b6117d92d9d97fdb4048a7f8b9ce09;hpb=689388c889a644a40ca1f447cc862da009049836 diff --git a/src/icu_chain.c b/src/icu_chain.c index 7bf8109..e7b9b4e 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-2011 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ @@ -37,7 +37,8 @@ enum icu_chain_step_type { ICU_chain_step_type_transform, /* apply utf16 transform */ ICU_chain_step_type_tokenize, /* apply utf16 tokenization */ ICU_chain_step_type_transliterate, /* apply utf16 tokenization */ - YAZ_chain_step_type_stemming /* apply utf16 stemming (YAZ) */ + YAZ_chain_step_type_stemming, /* apply utf16 stemming (YAZ) */ + ICU_chain_step_type_join }; struct icu_chain_step @@ -47,8 +48,9 @@ struct icu_chain_step union { struct icu_casemap *casemap; struct icu_transform *transform; - struct icu_tokenizer *tokenizer; + struct icu_tokenizer *tokenizer; yaz_stemmer_p stemmer; + struct icu_buf_utf16 *join; } u; struct icu_chain_step *previous; }; @@ -60,7 +62,7 @@ struct icu_chain int sort; UCollator *coll; - + /* linked list of chain steps */ struct icu_chain_step *csteps; }; @@ -70,17 +72,17 @@ int icu_check_status(UErrorCode status) if (U_FAILURE(status)) { yaz_log(YLOG_WARN, "ICU: %d %s\n", status, u_errorName(status)); - return 0; + return 0; } return 1; } static struct icu_chain_step *icu_chain_insert_step( struct icu_chain *chain, enum icu_chain_step_type type, - const uint8_t *rule, UErrorCode *status) + const char *rule, UErrorCode *status) { struct icu_chain_step *step = 0; - + if (!chain || !type || !rule) return 0; @@ -97,21 +99,21 @@ static struct icu_chain_step *icu_chain_insert_step( break; case ICU_chain_step_type_transform: /* rule omitted. Only ID used */ - step->u.transform = icu_transform_create((const char *) rule, 'f', - 0, status); + step->u.transform = icu_transform_create(rule, 'f', 0, status); break; case ICU_chain_step_type_tokenize: - step->u.tokenizer = icu_tokenizer_create(chain->locale, - (char) rule[0], status); + step->u.tokenizer = icu_tokenizer_create(chain->locale, rule[0], status); break; case ICU_chain_step_type_transliterate: /* we pass a dummy ID to utrans_openU.. */ - step->u.transform = icu_transform_create("custom", 'f', - (const char *) rule, status); + step->u.transform = icu_transform_create("custom", 'f', rule, status); break; case YAZ_chain_step_type_stemming: - step->u.stemmer = yaz_stemmer_create(chain->locale, - (const char *) rule, status); + step->u.stemmer = yaz_stemmer_create(chain->locale, rule, status); + break; + case ICU_chain_step_type_join: + step->u.join = icu_buf_utf16_create(0); + icu_utf16_from_utf8_cstr(step->u.join, rule, status); break; default: break; @@ -147,6 +149,9 @@ static void icu_chain_step_destroy(struct icu_chain_step *step) case YAZ_chain_step_type_stemming: yaz_stemmer_destroy(step->u.stemmer); break; + case ICU_chain_step_type_join: + icu_buf_utf16_destroy(step->u.join); + break; default: break; } @@ -161,7 +166,7 @@ struct icu_chain_step *icu_chain_step_clone(struct icu_chain_step *old) { *sp = (struct icu_chain_step *) xmalloc(sizeof(**sp)); (*sp)->type = old->type; - + switch ((*sp)->type) { case ICU_chain_step_type_display: @@ -181,6 +186,10 @@ struct icu_chain_step *icu_chain_step_clone(struct icu_chain_step *old) break; case ICU_chain_step_type_none: break; + case ICU_chain_step_type_join: + (*sp)->u.join = icu_buf_utf16_create(0); + (*sp)->u.join = icu_buf_utf16_copy((*sp)->u.join, old->u.join); + break; } old = old->previous; sp = &(*sp)->previous; @@ -192,21 +201,17 @@ struct icu_chain_step *icu_chain_step_clone(struct icu_chain_step *old) struct icu_chain *icu_chain_create(const char *locale, int sort, UErrorCode *status) { - struct icu_chain *chain - = (struct icu_chain *) xmalloc(sizeof(*chain)); + struct icu_chain *chain; + UCollator *coll = ucol_open(locale, status); - *status = U_ZERO_ERROR; + if (U_FAILURE(*status)) + return 0; + chain = (struct icu_chain *) xmalloc(sizeof(*chain)); chain->iter = 0; chain->locale = xstrdup(locale); - chain->sort = sort; - - chain->coll = ucol_open(chain->locale, status); - - if (U_FAILURE(*status)) - return 0; - + chain->coll = coll; chain->csteps = 0; return chain; @@ -227,7 +232,7 @@ void icu_chain_destroy(struct icu_chain *chain) } } -struct icu_chain *icu_chain_xml_config(const xmlNode *xml_node, +struct icu_chain *icu_chain_xml_config(const xmlNode *xml_node, int sort, UErrorCode *status) { @@ -235,12 +240,12 @@ struct icu_chain *icu_chain_xml_config(const xmlNode *xml_node, int no_errors = 0; struct icu_chain *chain = 0; NMEM nmem = 0; - + *status = U_ZERO_ERROR; if (xml_node && xml_node->type == XML_ELEMENT_NODE) { - xmlChar *xml_locale = xmlGetProp((xmlNode *) xml_node, + xmlChar *xml_locale = xmlGetProp((xmlNode *) xml_node, (xmlChar *) "locale"); if (xml_locale) { @@ -279,31 +284,39 @@ struct icu_chain *icu_chain_xml_config(const xmlNode *xml_node, } if (!rule && node->children) rule = nmem_text_node_cdata(node->children, nmem); - + if (!strcmp((const char *) node->name, "casemap")) - step = icu_chain_insert_step(chain, ICU_chain_step_type_casemap, - (const uint8_t *) rule, status); + step = icu_chain_insert_step(chain, + ICU_chain_step_type_casemap, + rule, status); else if (!strcmp((const char *) node->name, "transform")) - step = icu_chain_insert_step(chain, ICU_chain_step_type_transform, - (const uint8_t *) rule, status); + step = icu_chain_insert_step(chain, + ICU_chain_step_type_transform, + rule, status); else if (!strcmp((const char *) node->name, "transliterate")) - step = icu_chain_insert_step(chain, ICU_chain_step_type_transliterate, - (const uint8_t *) rule, status); + step = icu_chain_insert_step(chain, + ICU_chain_step_type_transliterate, + rule, status); else if (!strcmp((const char *) node->name, "tokenize")) - step = icu_chain_insert_step(chain, ICU_chain_step_type_tokenize, - (const uint8_t *) rule, status); + step = icu_chain_insert_step(chain, ICU_chain_step_type_tokenize, + rule, status); else if (!strcmp((const char *) node->name, "display")) - step = icu_chain_insert_step(chain, ICU_chain_step_type_display, - (const uint8_t *) "", status); + step = icu_chain_insert_step(chain, ICU_chain_step_type_display, + "", status); else if (!strcmp((const char *) node->name, "stemming")) step = icu_chain_insert_step(chain, YAZ_chain_step_type_stemming, - (const uint8_t *) rule, status); + rule, status); + else if (!strcmp((const char *) node->name, "join")) + { + step = icu_chain_insert_step(chain, ICU_chain_step_type_join, + rule, 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_transform, - (const uint8_t *) rule, status); + step = icu_chain_insert_step(chain, ICU_chain_step_type_transform, + rule, status); } else if (!strcmp((const char *) node->name, "index") || !strcmp((const char *) node->name, "sortkey")) @@ -317,6 +330,11 @@ struct icu_chain *icu_chain_xml_config(const xmlNode *xml_node, no_errors++; continue; } + if (!step) + { + yaz_log(YLOG_WARN, "Step not created for %s", node->name); + no_errors++; + } if (step && U_FAILURE(*status)) { no_errors++; @@ -351,7 +369,6 @@ void icu_utf16_print(struct icu_buf_utf16 *src16) struct icu_buf_utf8 *dst8 = icu_buf_utf8_create(0); icu_utf16_to_utf8(dst8, src16, &status); - assert(status != 1234); if (U_FAILURE(status)) { printf("failure"); @@ -373,7 +390,7 @@ struct icu_buf_utf16 *icu_iter_invoke(yaz_icu_iter_t iter, else { struct icu_buf_utf16 *dst = icu_iter_invoke(iter, step->previous, src); - + switch (step->type) { case ICU_chain_step_type_casemap: @@ -426,6 +443,22 @@ struct icu_buf_utf16 *icu_iter_invoke(yaz_icu_iter_t iter, icu_buf_utf16_destroy(src); } break; + case ICU_chain_step_type_join: + if (dst) + { + while (1) + { + struct icu_buf_utf16 *dst1 = + icu_iter_invoke(iter, step->previous, 0); + + if (!dst1) + break; + dst = icu_buf_utf16_append(dst, step->u.join); + dst = icu_buf_utf16_append(dst, dst1); + icu_buf_utf16_destroy(dst1); + } + } + break; default: assert(0); } @@ -480,18 +513,17 @@ int icu_iter_next(yaz_icu_iter_t iter) else { /* on first call, iter->input is the input string. Thereafter: 0. */ - iter->last = icu_iter_invoke(iter, iter->steps ? - iter->steps : iter->chain->csteps, - iter->input); + 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, iter->sort8, iter->last, &iter->status); @@ -514,16 +546,16 @@ const char *icu_iter_get_sortkey(yaz_icu_iter_t iter) } const char *icu_iter_get_display(yaz_icu_iter_t iter) -{ - return icu_buf_utf8_to_cstr(iter->display); +{ + return icu_buf_utf8_to_cstr(iter->display); } int icu_iter_get_token_number(yaz_icu_iter_t iter) -{ +{ return iter->token_count; } -int icu_chain_assign_cstr(struct icu_chain *chain, const char *src8cstr, +int icu_chain_assign_cstr(struct icu_chain *chain, const char *src8cstr, UErrorCode *status) { if (chain->iter)