/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
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;
}
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;
}
struct icu_iter {
struct icu_chain *chain;
struct icu_buf_utf16 *last;
+ struct icu_buf_utf16 *org;
UErrorCode status;
struct icu_buf_utf8 *display;
struct icu_buf_utf8 *sort8;
int token_count;
size_t org_start;
size_t org_len;
+ size_t utf8_base;
+ size_t utf16_base;
struct icu_chain_step *steps;
};
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->last = 0; /* no last returned string (yet) */
iter->steps = icu_chain_step_clone(chain->csteps);
iter->token_count = 0;
void icu_iter_first(yaz_icu_iter_t iter, const char *src8cstr)
{
- struct icu_buf_utf16 *input = icu_buf_utf16_create(0);
- icu_utf16_from_utf8_cstr(input, src8cstr, &iter->status);
+ 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;
iter->org_start = 0;
- iter->org_len = input->utf16_len;
- iter->last = icu_iter_invoke(iter, iter->steps, input);
+ 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)
icu_buf_utf8_destroy(iter->display);
icu_buf_utf8_destroy(iter->sort8);
icu_buf_utf8_destroy(iter->result);
+ icu_buf_utf16_destroy(iter->org);
icu_chain_step_destroy(iter->steps);
xfree(iter);
}
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;
+ 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;
+
+ iter->utf8_base = *start;
+ iter->utf16_base = iter->org_start;
}
int icu_chain_assign_cstr(struct icu_chain *chain, const char *src8cstr,