X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcharsets.c;h=b36d7e2573214462393857098517b29f284bc531;hb=c1de9c944c1383e173558b15bc693bd0eae2fba5;hp=f931445cd3d5fb934febe429d94e9f37aae4ff3d;hpb=2bd14321370e2d042c370d19149d6caec9c01930;p=pazpar2-moved-to-github.git diff --git a/src/charsets.c b/src/charsets.c index f931445..b36d7e2 100644 --- a/src/charsets.c +++ b/src/charsets.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2013 Index Data + Copyright (C) Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #include #include #include @@ -53,6 +54,8 @@ struct pp2_charset_s { const char *(*token_next_handler)(pp2_charset_token_t prt); const char *(*get_sort_handler)(pp2_charset_token_t prt); const char *(*get_display_handler)(pp2_charset_token_t prt); + void (*get_org_handler)(pp2_charset_token_t ptr, + size_t *start, size_t *len); #if YAZ_HAVE_ICU struct icu_chain * icu_chn; UErrorCode icu_sts; @@ -63,11 +66,15 @@ static const char *pp2_charset_token_null(pp2_charset_token_t prt); static const char *pp2_charset_token_a_to_z(pp2_charset_token_t prt); static const char *pp2_get_sort_ascii(pp2_charset_token_t prt); static const char *pp2_get_display_ascii(pp2_charset_token_t prt); +static void pp2_get_org_ascii(pp2_charset_token_t prt, + size_t *start, size_t *len); #if YAZ_HAVE_ICU static const char *pp2_charset_token_icu(pp2_charset_token_t prt); static const char *pp2_get_sort_icu(pp2_charset_token_t prt); static const char *pp2_get_display_icu(pp2_charset_token_t prt); +static void pp2_get_org_icu(pp2_charset_token_t prt, + size_t *start, size_t *len); #endif /* tokenzier handle */ @@ -80,6 +87,9 @@ struct pp2_charset_token_s { #if YAZ_HAVE_ICU yaz_icu_iter_t iter; #endif + const char *cp0; + size_t start; + size_t len; }; struct pp2_charset_fact_s { @@ -157,30 +167,40 @@ int pp2_charset_fact_add(pp2_charset_fact_t pft, } int pp2_charset_fact_define(pp2_charset_fact_t pft, - xmlNode *xml_node, const char *default_id) + xmlNode *xml_node, const char *id) { int r; pp2_charset_t pct; - xmlChar *id = 0; assert(xml_node); + + if (strcmp((const char *) xml_node->name, "icu_chain")) + { + yaz_log(YLOG_WARN, "Wrapper element <%s> deprecated", xml_node->name); + yaz_log(YLOG_LOG, "Use .. only", xml_node->name); + xml_node = xml_node->children; + while (xml_node && xml_node->type != XML_ELEMENT_NODE) + xml_node = xml_node->next; + } + if (!xml_node) + { + yaz_log(YLOG_FATAL, "Missing icu_chain element"); + return -1; + } pct = pp2_charset_create_xml(xml_node); if (!pct) return -1; - if (!default_id) + if (!id) { - id = xmlGetProp(xml_node, (xmlChar*) "id"); + id = yaz_xml_get_prop(xml_node, "id"); if (!id) { yaz_log(YLOG_WARN, "Missing id for icu_chain"); pp2_charset_destroy(pct); return -1; } - default_id = (const char *) id; } - r = pp2_charset_fact_add(pft, pct, default_id); - if (id) - xmlFree(id); + r = pp2_charset_fact_add(pft, pct, id); return r; } @@ -194,15 +214,9 @@ pp2_charset_t pp2_charset_create_xml(xmlNode *xml_node) #if YAZ_HAVE_ICU UErrorCode status = U_ZERO_ERROR; struct icu_chain *chain = 0; - while (xml_node && xml_node->type != XML_ELEMENT_NODE) - xml_node = xml_node->next; chain = icu_chain_xml_config(xml_node, 1, &status); - if (!chain || U_FAILURE(status)){ - //xmlDocPtr icu_doc = 0; - //xmlChar *xmlstr = 0; - //int size = 0; - //xmlDocDumpMemory(icu_doc, size); - + if (!chain || U_FAILURE(status)) + { yaz_log(YLOG_FATAL, "Could not parse ICU chain config:\n" "<%s>\n ... \n", xml_node->name, xml_node->name); @@ -226,6 +240,7 @@ pp2_charset_t pp2_charset_create(void) pct->token_next_handler = pp2_charset_token_null; pct->get_sort_handler = pp2_get_sort_ascii; pct->get_display_handler = pp2_get_display_ascii; + pct->get_org_handler = pp2_get_org_ascii; #if YAZ_HAVE_ICU pct->icu_chn = 0; #endif // YAZ_HAVE_ICU @@ -250,6 +265,7 @@ pp2_charset_t pp2_charset_create_icu(struct icu_chain *icu_chn) pct->token_next_handler = pp2_charset_token_icu; pct->get_sort_handler = pp2_get_sort_icu; pct->get_display_handler = pp2_get_display_icu; + pct->get_org_handler = pp2_get_org_icu; } return pct; } @@ -290,6 +306,8 @@ pp2_charset_token_t pp2_charset_tokenize(pp2_charset_t pct) if (pct->icu_chn) prt->iter = icu_iter_create(pct->icu_chn); #endif + prt->start = 0; + prt->len = 0; return prt; } @@ -313,6 +331,7 @@ void pp2_charset_token_first(pp2_charset_token_t prt, wrbuf_rewind(prt->norm_str); wrbuf_rewind(prt->sort_str); + prt->cp0 = buf; prt->cp = buf; prt->last_cp = 0; @@ -354,6 +373,12 @@ const char *pp2_get_display(pp2_charset_token_t prt) return prt->pct->get_display_handler(prt); } +void pp2_get_org(pp2_charset_token_t prt, size_t *start, size_t *len) +{ + prt->pct->get_org_handler(prt, start, len); +} + + #define raw_char(c) (((c) >= 'a' && (c) <= 'z') ? (c) : -1) /* original tokenizer with our tokenize interface, but we add +1 to ensure no '\0' are in our string (except for EOF) @@ -363,6 +388,7 @@ static const char *pp2_charset_token_a_to_z(pp2_charset_token_t prt) const char *cp = prt->cp; int c; + prt->start = cp - prt->cp0; /* skip white space */ while (*cp && (c = raw_char(tolower(*(const unsigned char *)cp))) < 0) cp++; @@ -381,6 +407,7 @@ static const char *pp2_charset_token_a_to_z(pp2_charset_token_t prt) wrbuf_putc(prt->norm_str, c); cp++; } + prt->len = (cp - prt->cp0) - prt->start; prt->cp = cp; return wrbuf_cstr(prt->norm_str); } @@ -412,6 +439,13 @@ static const char *pp2_get_display_ascii(pp2_charset_token_t prt) } } +static void pp2_get_org_ascii(pp2_charset_token_t prt, + size_t *start, size_t *len) +{ + *start = prt->start; + *len = prt->len; +} + static const char *pp2_charset_token_null(pp2_charset_token_t prt) { const char *cp = prt->cp; @@ -420,6 +454,7 @@ static const char *pp2_charset_token_null(pp2_charset_token_t prt) while (*cp) cp++; prt->cp = cp; + prt->len = cp - prt->cp0; return prt->last_cp; } @@ -443,6 +478,11 @@ static const char *pp2_get_display_icu(pp2_charset_token_t prt) return icu_iter_get_display(prt->iter); } +static void pp2_get_org_icu(pp2_charset_token_t prt, size_t *start, size_t *len) +{ + icu_iter_get_org_info(prt->iter, start, len); +} + #endif // YAZ_HAVE_ICU