/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
#include <yaz/icu_I18N.h>
-#include <yaz/log.h>
+#include <yaz/stemmer.h>
+#include <yaz/log.h>
+#include <yaz/nmem.h>
+#include <yaz/nmem_xml.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
enum icu_chain_step_type {
ICU_chain_step_type_none,
- ICU_chain_step_type_display, /* convert to utf8 display format */
- ICU_chain_step_type_casemap, /* apply utf16 charmap */
- ICU_chain_step_type_transform, /* apply utf16 transform */
- ICU_chain_step_type_tokenize, /* apply utf16 tokenization */
- ICU_chain_step_type_transliterate /* apply utf16 tokenization */
+ ICU_chain_step_type_display, /* convert to utf8 display format */
+ ICU_chain_step_type_casemap, /* apply utf16 charmap */
+ 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) */
};
struct icu_chain_step
/* type and action object */
enum icu_chain_step_type type;
union {
- struct icu_casemap * casemap;
- struct icu_transform * transform;
- struct icu_tokenizer * tokenizer;
+ struct icu_casemap *casemap;
+ struct icu_transform *transform;
+ struct icu_tokenizer *tokenizer;
+ yaz_stemmer_p stemmer;
} u;
- /* temprary post-action utf16 buffer */
- struct icu_buf_utf16 * buf16;
- struct icu_chain_step * previous;
- int more_tokens;
- int need_new_token;
+ struct icu_chain_step *previous;
};
struct icu_chain
{
+ yaz_icu_iter_t iter;
char *locale;
int sort;
- const char * src8cstr;
-
- UCollator * coll;
-
- /* number of tokens returned so far */
- int32_t token_count;
-
- /* utf8 output buffers */
- struct icu_buf_utf8 * display8;
- struct icu_buf_utf8 * norm8;
- struct icu_buf_utf8 * sort8;
-
- /* utf16 source buffer */
- struct icu_buf_utf16 * src16;
-
+ UCollator *coll;
+
/* linked list of chain steps */
- struct icu_chain_step * steps;
+ struct icu_chain_step *csteps;
};
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_step_create(
- struct icu_chain * chain, enum icu_chain_step_type type,
- const uint8_t * rule, struct icu_buf_utf16 * buf16,
- UErrorCode *status)
+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)
{
- struct icu_chain_step * step = 0;
-
- if(!chain || !type || !rule)
+ struct icu_chain_step *step = 0;
+
+ if (!chain || !type || !rule)
return 0;
- step = (struct icu_chain_step *) xmalloc(sizeof(struct icu_chain_step));
+ step = (struct icu_chain_step *) xmalloc(sizeof(*step));
step->type = type;
-
- step->buf16 = buf16;
-
/* create auxilary objects */
switch (step->type)
{
0, status);
break;
case ICU_chain_step_type_tokenize:
- step->u.tokenizer = icu_tokenizer_create((char *) chain->locale,
+ step->u.tokenizer = icu_tokenizer_create(chain->locale,
(char) rule[0], status);
break;
case ICU_chain_step_type_transliterate:
step->u.transform = icu_transform_create("custom", 'f',
(const char *) rule, status);
break;
+ case YAZ_chain_step_type_stemming:
+ step->u.stemmer = yaz_stemmer_create(chain->locale,
+ (const char *) rule, status);
+ break;
default:
break;
}
+ step->previous = chain->csteps;
+ chain->csteps = step;
+
return step;
}
-static void icu_chain_step_destroy(struct icu_chain_step * step)
+static void icu_chain_step_destroy(struct icu_chain_step *step)
{
if (!step)
return;
break;
case ICU_chain_step_type_casemap:
icu_casemap_destroy(step->u.casemap);
- icu_buf_utf16_destroy(step->buf16);
break;
case ICU_chain_step_type_transform:
case ICU_chain_step_type_transliterate:
icu_transform_destroy(step->u.transform);
- icu_buf_utf16_destroy(step->buf16);
break;
case ICU_chain_step_type_tokenize:
icu_tokenizer_destroy(step->u.tokenizer);
- icu_buf_utf16_destroy(step->buf16);
+ break;
+ case YAZ_chain_step_type_stemming:
+ yaz_stemmer_destroy(step->u.stemmer);
break;
default:
break;
xfree(step);
}
-struct icu_chain *icu_chain_create(const char *locale, int sort,
- UErrorCode * status)
+struct icu_chain_step *icu_chain_step_clone(struct icu_chain_step *old)
{
- struct icu_chain * chain
- = (struct icu_chain *) xmalloc(sizeof(struct icu_chain));
-
- *status = U_ZERO_ERROR;
-
- chain->locale = xstrdup(locale);
+ struct icu_chain_step *step = 0;
+ struct icu_chain_step **sp = &step;
+ while (old)
+ {
+ *sp = (struct icu_chain_step *) xmalloc(sizeof(**sp));
+ (*sp)->type = old->type;
- chain->sort = sort;
+ switch ((*sp)->type)
+ {
+ case ICU_chain_step_type_display:
+ break;
+ case ICU_chain_step_type_casemap:
+ (*sp)->u.casemap = icu_casemap_clone(old->u.casemap);
+ break;
+ case ICU_chain_step_type_transform:
+ case ICU_chain_step_type_transliterate:
+ (*sp)->u.transform = icu_transform_clone(old->u.transform);
+ break;
+ case ICU_chain_step_type_tokenize:
+ (*sp)->u.tokenizer = icu_tokenizer_clone(old->u.tokenizer);
+ break;
+ case YAZ_chain_step_type_stemming:
+ (*sp)->u.stemmer = yaz_stemmer_clone(old->u.stemmer);
+ break;
+ case ICU_chain_step_type_none:
+ break;
+ }
+ old = old->previous;
+ sp = &(*sp)->previous;
+ }
+ *sp = 0;
+ return step;
+}
- chain->coll = ucol_open((const char *) chain->locale, status);
+struct icu_chain *icu_chain_create(const char *locale, int sort,
+ UErrorCode *status)
+{
+ struct icu_chain *chain;
+ UCollator *coll = ucol_open(locale, status);
if (U_FAILURE(*status))
return 0;
- chain->token_count = 0;
-
- chain->src8cstr = 0;
-
- chain->display8 = icu_buf_utf8_create(0);
- chain->norm8 = icu_buf_utf8_create(0);
- chain->sort8 = icu_buf_utf8_create(0);
-
- chain->src16 = icu_buf_utf16_create(0);
-
- chain->steps = 0;
+ chain = (struct icu_chain *) xmalloc(sizeof(*chain));
+ chain->iter = 0;
+ chain->locale = xstrdup(locale);
+ chain->sort = sort;
+ chain->coll = coll;
+ chain->csteps = 0;
return chain;
}
-void icu_chain_destroy(struct icu_chain * chain)
+void icu_chain_destroy(struct icu_chain *chain)
{
if (chain)
{
if (chain->coll)
ucol_close(chain->coll);
- icu_buf_utf8_destroy(chain->display8);
- icu_buf_utf8_destroy(chain->norm8);
- icu_buf_utf8_destroy(chain->sort8);
-
- icu_buf_utf16_destroy(chain->src16);
-
- icu_chain_step_destroy(chain->steps);
+ if (chain->iter)
+ icu_iter_destroy(chain->iter);
+ icu_chain_step_destroy(chain->csteps);
xfree(chain->locale);
xfree(chain);
}
}
-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);
-
-struct icu_chain * icu_chain_xml_config(const xmlNode *xml_node,
- int sort,
- UErrorCode * status)
+struct icu_chain *icu_chain_xml_config(const xmlNode *xml_node,
+ int sort,
+ UErrorCode *status)
{
xmlNode *node = 0;
- struct icu_chain * chain = 0;
-
+ 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)
- return 0;
-
+ if (xml_node && xml_node->type == XML_ELEMENT_NODE)
{
- xmlChar * xml_locale = xmlGetProp((xmlNode *) xml_node,
- (xmlChar *) "locale");
-
+ 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;
+ nmem = nmem_create();
for (node = xml_node->children; node; node = node->next)
{
- xmlChar *xml_rule;
- struct icu_chain_step * step = 0;
+ char *rule = 0;
+ struct icu_chain_step *step = 0;
+ struct _xmlAttr *attr;
+ nmem_reset(nmem);
if (node->type != XML_ELEMENT_NODE)
continue;
- xml_rule = xmlGetProp(node, (xmlChar *) "rule");
+ for (attr = node->properties; attr; attr = attr->next)
+ {
+ 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++;
+ continue;
+ }
+ }
+ 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 *) xml_rule, status);
+ step = icu_chain_insert_step(chain, ICU_chain_step_type_casemap,
+ (const uint8_t *) rule, status);
else if (!strcmp((const char *) node->name, "transform"))
- step = icu_chain_insert_step(chain, ICU_chain_step_type_transform,
- (const uint8_t *) xml_rule, status);
+ step = icu_chain_insert_step(chain, ICU_chain_step_type_transform,
+ (const uint8_t *) rule, status);
else if (!strcmp((const char *) node->name, "transliterate"))
- step = icu_chain_insert_step(chain, ICU_chain_step_type_transliterate,
- (const uint8_t *) xml_rule, status);
+ step = icu_chain_insert_step(chain, ICU_chain_step_type_transliterate,
+ (const uint8_t *) rule, status);
else if (!strcmp((const char *) node->name, "tokenize"))
- step = icu_chain_insert_step(chain, ICU_chain_step_type_tokenize,
- (const uint8_t *) xml_rule, status);
+ step = icu_chain_insert_step(chain, ICU_chain_step_type_tokenize,
+ (const uint8_t *) rule, status);
else if (!strcmp((const char *) node->name, "display"))
- step = icu_chain_insert_step(chain, ICU_chain_step_type_display,
+ step = icu_chain_insert_step(chain, ICU_chain_step_type_display,
(const uint8_t *) "", 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);
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 *) xml_rule, status);
+ step = icu_chain_insert_step(chain, ICU_chain_step_type_transform,
+ (const uint8_t *) rule, status);
}
else if (!strcmp((const char *) node->name, "index")
|| !strcmp((const char *) node->name, "sortkey"))
else
{
yaz_log(YLOG_WARN, "Unknown element %s", node->name);
- icu_chain_destroy(chain);
- return 0;
+ no_errors++;
+ continue;
}
- xmlFree(xml_rule);
if (step && U_FAILURE(*status))
{
- icu_chain_destroy(chain);
- return 0;
+ no_errors++;
+ break;
}
}
- return chain;
-}
-
-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)
-{
- struct icu_chain_step * step = 0;
- struct icu_buf_utf16 * src16 = 0;
- struct icu_buf_utf16 * buf16 = 0;
-
- if (!chain || !type || !rule)
- return 0;
-
- /* assign utf16 src buffers as needed */
- if (chain->steps && chain->steps->buf16)
- src16 = chain->steps->buf16;
- else if (chain->src16)
- src16 = chain->src16;
- else
- return 0;
-
- /* create utf16 destination buffers as needed, or */
- switch (type)
+ nmem_destroy(nmem);
+ if (no_errors)
{
- case ICU_chain_step_type_display:
- buf16 = src16;
- break;
- case ICU_chain_step_type_casemap:
- buf16 = icu_buf_utf16_create(0);
- break;
- case ICU_chain_step_type_transform:
- case ICU_chain_step_type_transliterate:
- buf16 = icu_buf_utf16_create(0);
- break;
- case ICU_chain_step_type_tokenize:
- buf16 = icu_buf_utf16_create(0);
- break;
- break;
- default:
- break;
- }
- /* create actual chain step with this buffer */
- step = icu_chain_step_create(chain, type, rule, buf16, status);
-
- step->previous = chain->steps;
- chain->steps = step;
-
- return step;
-}
-
-static int icu_chain_step_next_token(struct icu_chain * chain,
- struct icu_chain_step * step,
- UErrorCode *status)
-{
- struct icu_buf_utf16 * src16 = 0;
- int got_new_token = 0;
-
- if (!chain || !chain->src16 || !step || !step->more_tokens)
+ icu_chain_destroy(chain);
return 0;
-
- /* assign utf16 src buffers as needed, advance in previous steps
- tokens until non-zero token met, and setting stop condition */
-
- if (step->previous)
- {
- src16 = step->previous->buf16;
- /* tokens might be killed in previous steps, therefore looping */
-
- while (step->need_new_token
- && step->previous->more_tokens
- && !got_new_token)
- got_new_token
- = icu_chain_step_next_token(chain, step->previous, status);
}
- else
- { /* first step can only work once on chain->src16 input buffer */
- src16 = chain->src16;
- step->more_tokens = 0;
- got_new_token = 1;
- }
-
- if (!src16)
- return 0;
-
- /* stop if nothing to process */
- if (step->need_new_token && !got_new_token)
- {
- step->more_tokens = 0;
- return 0;
- }
-
- /* either an old token not finished yet, or a new token, thus
- perform the work, eventually put this steps output in
- step->buf16 or the chains UTF8 output buffers */
-
- switch (step->type)
- {
- case ICU_chain_step_type_display:
- icu_utf16_to_utf8(chain->display8, src16, status);
- break;
- case ICU_chain_step_type_casemap:
- icu_casemap_casemap(step->u.casemap,
- step->buf16, src16, status,
- chain->locale);
- break;
- case ICU_chain_step_type_transform:
- case ICU_chain_step_type_transliterate:
- icu_transform_trans(step->u.transform,
- step->buf16, src16, status);
- break;
- case ICU_chain_step_type_tokenize:
- /* attach to new src16 token only first time during splitting */
- if (step->need_new_token)
- {
- icu_tokenizer_attach(step->u.tokenizer, src16, status);
- step->need_new_token = 0;
- }
-
- /* splitting one src16 token into multiple buf16 tokens */
- step->more_tokens
- = icu_tokenizer_next_token(step->u.tokenizer,
- step->buf16, status);
-
- /* make sure to get new previous token if this one had been used up
- by recursive call to _same_ step */
-
- if (!step->more_tokens)
- {
- step->more_tokens = icu_chain_step_next_token(chain, step, status);
- return step->more_tokens; /* avoid one token count too much! */
- }
- break;
- default:
- return 0;
- break;
- }
-
- if (U_FAILURE(*status))
- return 0;
-
- /* if token disappered into thin air, tell caller */
- /* if (!step->buf16->utf16_len && !step->more_tokens) */
- /* return 0; */
-
- return 1;
+ return chain;
}
struct icu_iter {
struct icu_chain *chain;
- struct icu_buf_utf16 *next;
+ struct icu_buf_utf16 *last;
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;
+ struct icu_chain_step *steps;
};
-static void utf16_print(struct icu_buf_utf16 *src16)
+void icu_utf16_print(struct icu_buf_utf16 *src16)
{
UErrorCode status = U_ZERO_ERROR;
const char *p;
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("utf8:failure\n");
+ printf("failure");
}
else
{
p = icu_buf_utf8_to_cstr(dst8);
- printf("utf8:%s\n", p);
+ printf("%s", p);
}
icu_buf_utf8_destroy(dst8);
}
-struct icu_buf_utf16 *icu_iter_invoke(struct icu_iter *iter,
+struct icu_buf_utf16 *icu_iter_invoke(yaz_icu_iter_t iter,
struct icu_chain_step *step,
struct icu_buf_utf16 *src)
{
else
{
struct icu_buf_utf16 *dst = icu_iter_invoke(iter, step->previous, src);
-
+
switch (step->type)
{
case ICU_chain_step_type_casemap:
if (dst)
icu_utf16_to_utf8(iter->display, dst, &iter->status);
break;
+ case YAZ_chain_step_type_stemming:
+ if (dst)
+ {
+ struct icu_buf_utf16 *src = dst;
+ dst = icu_buf_utf16_create(0);
+ yaz_stemmer_stem(step->u.stemmer, dst, src, &iter->status);
+ icu_buf_utf16_destroy(src);
+ }
+ break;
default:
assert(0);
}
}
}
-struct icu_iter *icu_iter_create(struct icu_chain *chain,
- const char *src8cstr)
+yaz_icu_iter_t icu_iter_create(struct icu_chain *chain)
{
- if (!src8cstr)
- return 0;
- else
- {
- struct icu_buf_utf16 *src16 = icu_buf_utf16_create(0);
- struct icu_iter *iter = xmalloc(sizeof(*iter));
- iter->chain = chain;
- iter->status = U_ZERO_ERROR;
- iter->display = icu_buf_utf8_create(0);
- iter->sort8 = icu_buf_utf8_create(0);
-
- icu_utf16_from_utf8_cstr(src16, src8cstr, &iter->status);
- iter->next = icu_iter_invoke(iter, chain->steps, src16);
- return iter;
- }
+ yaz_icu_iter_t iter = xmalloc(sizeof(*iter));
+ iter->chain = chain;
+ iter->status = U_ZERO_ERROR;
+ iter->display = icu_buf_utf8_create(0);
+ iter->sort8 = icu_buf_utf8_create(0);
+ iter->result = icu_buf_utf8_create(0);
+ iter->last = 0; /* no last returned string (yet) */
+ iter->steps = icu_chain_step_clone(chain->csteps);
+ iter->input = 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);
+ 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);
}
-void icu_iter_destroy(struct icu_iter *iter)
+void icu_iter_destroy(yaz_icu_iter_t iter)
{
if (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_chain_step_destroy(iter->steps);
xfree(iter);
}
}
-int icu_iter_next(struct icu_iter *iter, struct icu_buf_utf8 *result)
+int icu_iter_next(yaz_icu_iter_t iter)
{
- struct icu_buf_utf16 *last = iter->next;
- if (!last)
+ if (!iter->input && iter->last == 0)
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,
- iter->sort8, last,
+ iter->sort8, iter->last,
&iter->status);
}
- icu_utf16_to_utf8(result, last, &iter->status);
- iter->next = icu_iter_invoke(iter, iter->chain->steps, 0);
- icu_buf_utf16_destroy(last);
+ icu_utf16_to_utf8(iter->result, iter->last, &iter->status);
+ icu_buf_utf16_destroy(iter->last);
+
return 1;
}
}
-const char *icu_iter_get_sortkey(struct icu_iter *iter)
+const char *icu_iter_get_norm(yaz_icu_iter_t iter)
{
- return icu_buf_utf8_to_cstr(iter->sort8);
+ return icu_buf_utf8_to_cstr(iter->result);
}
-const char *icu_iter_get_display(struct icu_iter *iter)
-{
- return icu_buf_utf8_to_cstr(iter->display);
+const char *icu_iter_get_sortkey(yaz_icu_iter_t iter)
+{
+ return icu_buf_utf8_to_cstr(iter->sort8);
}
-int icu_chain_assign_cstr(struct icu_chain * chain, const char * src8cstr,
- UErrorCode *status)
+const char *icu_iter_get_display(yaz_icu_iter_t iter)
{
- struct icu_chain_step * stp = 0;
-
- if (!chain || !src8cstr)
- return 0;
-
- chain->src8cstr = src8cstr;
-
- stp = chain->steps;
-
- /* clear token count */
- chain->token_count = 0;
+ return icu_buf_utf8_to_cstr(iter->display);
+}
- /* clear all steps stop states */
- while (stp)
- {
- stp->more_tokens = 1;
- stp->need_new_token = 1;
- stp = stp->previous;
- }
-
- /* finally convert UTF8 to UTF16 string if needed */
- if (chain->steps || chain->sort)
- icu_utf16_from_utf8_cstr(chain->src16, chain->src8cstr, status);
-
- if (U_FAILURE(*status))
- return 0;
+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,
+ UErrorCode *status)
+{
+ if (chain->iter)
+ icu_iter_destroy(chain->iter);
+ chain->iter = icu_iter_create(chain);
+ icu_iter_first(chain->iter, src8cstr);
return 1;
}
-int icu_chain_next_token(struct icu_chain * chain, UErrorCode *status)
+int icu_chain_next_token(struct icu_chain *chain, UErrorCode *status)
{
- int got_token = 0;
-
*status = U_ZERO_ERROR;
-
- if (!chain)
- return 0;
-
- /* special case with no steps - same as index type binary */
- if (!chain->steps)
- {
- if (chain->token_count)
- return 0;
- else
- {
- chain->token_count++;
-
- if (chain->sort)
- icu_sortkey8_from_utf16(chain->coll,
- chain->sort8, chain->steps->buf16,
- status);
- return chain->token_count;
- }
- }
- /* usual case, one or more icu chain steps existing */
- else
- {
- while (!got_token && chain->steps && chain->steps->more_tokens)
- got_token = icu_chain_step_next_token(chain, chain->steps, status);
-
- if (got_token)
- {
- chain->token_count++;
-
- icu_utf16_to_utf8(chain->norm8, chain->steps->buf16, status);
-
- if (chain->sort)
- icu_sortkey8_from_utf16(chain->coll,
- chain->sort8, chain->steps->buf16,
- status);
- return chain->token_count;
- }
- }
-
- return 0;
+ return icu_iter_next(chain->iter);
}
-int icu_chain_token_number(struct icu_chain * chain)
+int icu_chain_token_number(struct icu_chain *chain)
{
- if (!chain)
- return 0;
-
- return chain->token_count;
+ if (chain && chain->iter)
+ return chain->iter->token_count;
+ return 0;
}
-const char * icu_chain_token_display(struct icu_chain * chain)
+const char *icu_chain_token_display(struct icu_chain *chain)
{
- if (chain->display8)
- return icu_buf_utf8_to_cstr(chain->display8);
-
+ if (chain->iter)
+ return icu_iter_get_display(chain->iter);
return 0;
}
-const char * icu_chain_token_norm(struct icu_chain * chain)
+const char *icu_chain_token_norm(struct icu_chain *chain)
{
- if (!chain->steps)
- return chain->src8cstr;
-
- if (chain->norm8)
- return icu_buf_utf8_to_cstr(chain->norm8);
-
+ if (chain->iter)
+ return icu_iter_get_norm(chain->iter);
return 0;
}
-const char * icu_chain_token_sortkey(struct icu_chain * chain)
+const char *icu_chain_token_sortkey(struct icu_chain *chain)
{
- if (chain->sort8)
- return icu_buf_utf8_to_cstr(chain->sort8);
-
+ if (chain->iter)
+ return icu_iter_get_sortkey(chain->iter);
return 0;
}
projects / yaz-moved-to-github.git / blobdiff