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;
int token_count;
size_t org_start;
size_t org_len;
+ size_t utf8_base;
+ size_t utf16_base;
struct icu_chain_step *steps;
};
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);
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->token_count = 0;
icu_buf_utf16_copy(iter->org, src);
iter->token_count = 0;
iter->org_start = 0;
+ iter->utf8_base = iter->utf16_base = 0;
iter->org_len = src->utf16_len;
iter->last = icu_iter_invoke(iter, iter->steps, src);
}
icu_buf_utf8_destroy(iter->sort8);
icu_buf_utf8_destroy(iter->result);
icu_buf_utf16_destroy(iter->org);
+ icu_buf_utf8_destroy(iter->org8);
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)
+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;
- u_strToUTF8(0, 0, &len1, iter->org->utf16, iter->org_start,
+ 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;
- u_strToUTF8(0, 0, &len2, iter->org->utf16 + iter->org_start, iter->org_len,
+
+ *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);
- *start = len1;
- *len = len2;
+
+ *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)
+{
+ icu_iter_get_org_info2(iter, start, len, 0);
}
int icu_chain_assign_cstr(struct icu_chain *chain, const char *src8cstr,
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 */