* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: icu_I18N.c,v 1.2 2007-10-22 17:32:07 adam Exp $
+ * $Id: icu_I18N.c,v 1.12 2007-11-07 10:19:12 adam Exp $
*/
#if HAVE_CONFIG_H
return buf16;
}
-struct icu_buf_utf16 * icu_buf_utf16_resize(struct icu_buf_utf16 * buf16,
- size_t capacity)
+struct icu_buf_utf16 * icu_buf_utf16_clear(struct icu_buf_utf16 * buf16)
{
if (buf16){
- if (capacity > 0){
- if (0 == buf16->utf16)
- buf16->utf16 = (UChar *) malloc(sizeof(UChar) * capacity);
- else
- buf16->utf16
- = (UChar *) realloc(buf16->utf16, sizeof(UChar) * capacity);
+ if (buf16->utf16)
buf16->utf16[0] = (UChar) 0;
- buf16->utf16_len = 0;
- buf16->utf16_cap = capacity;
- }
- else {
- if (buf16->utf16)
- free(buf16->utf16);
- buf16->utf16 = 0;
- buf16->utf16_len = 0;
- buf16->utf16_cap = 0;
- }
+ buf16->utf16_len = 0;
+ }
+ return buf16;
+}
+
+struct icu_buf_utf16 * icu_buf_utf16_resize(struct icu_buf_utf16 * buf16,
+ size_t capacity)
+{
+ if (!buf16)
+ return 0;
+
+ if (capacity > 0){
+ if (0 == buf16->utf16)
+ buf16->utf16 = (UChar *) malloc(sizeof(UChar) * capacity);
+ else
+ buf16->utf16
+ = (UChar *) realloc(buf16->utf16, sizeof(UChar) * capacity);
+
+ icu_buf_utf16_clear(buf16);
+ buf16->utf16_cap = capacity;
+ }
+ else {
+ if (buf16->utf16)
+ free(buf16->utf16);
+ buf16->utf16 = 0;
+ buf16->utf16_len = 0;
+ buf16->utf16_cap = 0;
}
return buf16;
}
+struct icu_buf_utf8 * icu_buf_utf8_clear(struct icu_buf_utf8 * buf8)
+{
+ if (buf8){
+ if (buf8->utf8)
+ buf8->utf8[0] = (uint8_t) 0;
+ buf8->utf8_len = 0;
+ }
+ return buf8;
+}
+
struct icu_buf_utf8 * icu_buf_utf8_resize(struct icu_buf_utf8 * buf8,
size_t capacity)
{
- if (buf8){
- if (capacity > 0){
- if (0 == buf8->utf8)
- buf8->utf8 = (uint8_t *) malloc(sizeof(uint8_t) * capacity);
- else
- buf8->utf8
- = (uint8_t *) realloc(buf8->utf8,
- sizeof(uint8_t) * capacity);
- buf8->utf8_cap = capacity;
- }
- else {
- if (buf8->utf8)
- free(buf8->utf8);
- buf8->utf8 = 0;
- buf8->utf8_len = 0;
- buf8->utf8_cap = 0;
- }
- }
+ if (!buf8)
+ return 0;
+
+ if (capacity > 0){
+ if (0 == buf8->utf8)
+ buf8->utf8 = (uint8_t *) malloc(sizeof(uint8_t) * capacity);
+ else
+ buf8->utf8
+ = (uint8_t *) realloc(buf8->utf8, sizeof(uint8_t) * capacity);
+ icu_buf_utf8_clear(buf8);
+ buf8->utf8_cap = capacity;
+ }
+ else {
+ if (buf8->utf8)
+ free(buf8->utf8);
+ buf8->utf8 = 0;
+ buf8->utf8_len = 0;
+ buf8->utf8_cap = 0;
+ }
+
return buf8;
}
{
if (!src8 || src8->utf8_len == 0)
return "";
+
if (src8->utf8_len == src8->utf8_cap)
src8 = icu_buf_utf8_resize(src8, src8->utf8_len * 2 + 1);
+
src8->utf8[src8->utf8_len] = '\0';
+
return (const char *) src8->utf8;
}
if (U_SUCCESS(*status)
&& utf16_len <= dest16->utf16_cap)
dest16->utf16_len = utf16_len;
- else {
- dest16->utf16[0] = (UChar) 0;
- dest16->utf16_len = 0;
- }
+ else
+ icu_buf_utf16_clear(dest16);
return *status;
}
size_t src8cstr_len = 0;
int32_t utf16_len = 0;
+ *status = U_ZERO_ERROR;
src8cstr_len = strlen(src8cstr);
u_strFromUTF8(dest16->utf16, dest16->utf16_cap,
if (U_SUCCESS(*status)
&& utf16_len <= dest16->utf16_cap)
dest16->utf16_len = utf16_len;
- else {
- dest16->utf16[0] = (UChar) 0;
- dest16->utf16_len = 0;
- }
+ else
+ icu_buf_utf16_clear(dest16);
return *status;
}
if (U_SUCCESS(*status)
&& utf8_len <= dest8->utf8_cap)
dest8->utf8_len = utf8_len;
- else {
- dest8->utf8[0] = (uint8_t) 0;
- dest8->utf8_len = 0;
- }
+ else
+ icu_buf_utf8_clear(dest8);
return *status;
}
switch(casemap->action) {
case 'l':
- break;
+ case 'L':
case 'u':
- break;
+ case 'U':
case 't':
- break;
+ case 'T':
case 'f':
+ case 'F':
break;
default:
icu_casemap_destroy(casemap);
UErrorCode *status)
{
int32_t dest16_len = 0;
+
+
+ if (!src16->utf16_len){ //guarding for empty source string
+ if (dest16->utf16)
+ dest16->utf16[0] = (UChar) 0;
+ dest16->utf16_len = 0;
+ return U_ZERO_ERROR;
+ }
+
switch(action) {
case 'l':
+ case 'L':
dest16_len = u_strToLower(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
locale, status);
break;
case 'u':
+ case 'U':
dest16_len = u_strToUpper(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
locale, status);
break;
case 't':
+ case 'T':
dest16_len = u_strToTitle(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
0, locale, status);
break;
case 'f':
+ case 'F':
dest16_len = u_strFoldCase(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
U_FOLD_CASE_DEFAULT, status);
switch(action) {
case 'l':
+ case 'L':
dest16_len = u_strToLower(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
locale, status);
break;
case 'u':
+ case 'U':
dest16_len = u_strToUpper(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
locale, status);
break;
case 't':
+ case 'T':
dest16_len = u_strToTitle(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
0, locale, status);
break;
case 'f':
+ case 'F':
dest16_len = u_strFoldCase(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
U_FOLD_CASE_DEFAULT, status);
&& dest16_len <= dest16->utf16_cap)
dest16->utf16_len = dest16_len;
else {
- dest16->utf16[0] = (UChar) 0;
+ if (dest16->utf16)
+ dest16->utf16[0] = (UChar) 0;
dest16->utf16_len = 0;
}
if (U_SUCCESS(*status)
&& sortkey_len > 0)
dest8->utf8_len = sortkey_len;
- else {
- dest8->utf8[0] = (UChar) 0;
- dest8->utf8_len = 0;
- }
-
+ else
+ icu_buf_utf8_clear(dest8);
+
return sortkey_len;
}
switch(tokenizer->action) {
case 'l':
+ case 'L':
tokenizer->bi
= ubrk_open(UBRK_LINE, tokenizer->locale,
0, 0, status);
break;
case 's':
+ case 'S':
tokenizer->bi
= ubrk_open(UBRK_SENTENCE, tokenizer->locale,
0, 0, status);
break;
case 'w':
+ case 'W':
tokenizer->bi
= ubrk_open(UBRK_WORD, tokenizer->locale,
0, 0, status);
break;
case 'c':
+ case 'C':
tokenizer->bi
= ubrk_open(UBRK_CHARACTER, tokenizer->locale,
0, 0, status);
break;
case 't':
+ case 'T':
tokenizer->bi
= ubrk_open(UBRK_TITLE, tokenizer->locale,
0, 0, status);
switch(normalizer->action) {
case 'f':
+ case 'F':
normalizer->trans
= utrans_openU(normalizer->rules16->utf16,
normalizer->rules16->utf16_len,
normalizer->parse_error, status);
break;
case 'r':
+ case 'R':
normalizer->trans
= utrans_openU(normalizer->rules16->utf16,
normalizer->rules16->utf16_len,
if (normalizer->rules16)
icu_buf_utf16_destroy(normalizer->rules16);
if (normalizer->trans)
- {
utrans_close(normalizer->trans);
- }
free(normalizer);
}
}
struct icu_buf_utf16 * src16,
UErrorCode *status)
{
- if (!normalizer || !normalizer->trans || !src16 || !dest16)
+ if (!normalizer || !normalizer->trans
+ || !src16
+ || !dest16)
return 0;
+ if (!src16->utf16_len){ //guarding for empty source string
+ icu_buf_utf16_clear(dest16);
+ return 0;
+ }
+
if (!icu_buf_utf16_copy(dest16, src16))
return 0;
+
utrans_transUChars (normalizer->trans,
dest16->utf16, &(dest16->utf16_len),
dest16->utf16_cap,
0, &(src16->utf16_len), status);
- if (U_FAILURE(*status)){
- dest16->utf16[0] = (UChar) 0;
- dest16->utf16_len = 0;
- }
+ if (U_FAILURE(*status))
+ icu_buf_utf16_clear(dest16);
return dest16->utf16_len;
}
switch(step->type) {
case ICU_chain_step_type_display:
break;
- case ICU_chain_step_type_index:
- break;
- case ICU_chain_step_type_sortkey:
- break;
case ICU_chain_step_type_casemap:
step->u.casemap = icu_casemap_create((char *) chain->locale,
(char) rule[0], status);
switch(step->type) {
case ICU_chain_step_type_display:
break;
- case ICU_chain_step_type_index:
- break;
- case ICU_chain_step_type_sortkey:
- break;
case ICU_chain_step_type_casemap:
icu_casemap_destroy(step->u.casemap);
icu_buf_utf16_destroy(step->buf16);
-struct icu_chain * icu_chain_create(const uint8_t * identifier,
- const uint8_t * locale)
+struct icu_chain * icu_chain_create(const char *locale,
+ int sort,
+ UErrorCode * status)
{
struct icu_chain * chain
= (struct icu_chain *) malloc(sizeof(struct icu_chain));
- strncpy((char *) chain->identifier, (const char *) identifier, 128);
- chain->identifier[128 - 1] = '\0';
+ *status = U_ZERO_ERROR;
+
strncpy((char *) chain->locale, (const char *) locale, 16);
chain->locale[16 - 1] = '\0';
+ chain->sort = sort;
+
+ chain->coll = ucol_open((const char *) chain->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);
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);
-struct icu_chain * icu_chain_xml_config(xmlNode *xml_node,
+struct icu_chain * icu_chain_xml_config(const xmlNode *xml_node,
+ const char *locale,
+ int sort,
UErrorCode * status){
xmlNode *node = 0;
struct icu_chain * chain = 0;
+ *status = U_ZERO_ERROR;
+
if (!xml_node
||xml_node->type != XML_ELEMENT_NODE
- || strcmp((const char *) xml_node->name, "icu_chain"))
+ // || strcmp((const char *) xml_node->name, "icu_chain")
+ )
return 0;
- {
- xmlChar *xml_id = xmlGetProp(xml_node, (xmlChar *) "id");
- xmlChar *xml_locale = xmlGetProp(xml_node, (xmlChar *) "locale");
-
- if (!xml_id || !strlen((const char *) xml_id)
- || !xml_locale || !strlen((const char *) xml_locale))
- return 0;
-
- chain = icu_chain_create((const uint8_t *) xml_id,
- (const uint8_t *) xml_locale);
-
- xmlFree(xml_id);
- xmlFree(xml_locale);
- }
+ chain = icu_chain_create(locale, sort, status);
+
if (!chain)
return 0;
+
for (node = xml_node->children; node; node = node->next)
{
step = icu_chain_insert_step(chain, ICU_chain_step_type_display,
(const uint8_t *) "", status);
}
- else if (!strcmp((const char *) node->name,
- (const char *) "index")){
- step = icu_chain_insert_step(chain, ICU_chain_step_type_index,
- (const uint8_t *) "", status);
- }
- else if (!strcmp((const char *) node->name,
- (const char *) "sortkey")){
- step = icu_chain_insert_step(chain, ICU_chain_step_type_sortkey,
- (const uint8_t *) "", status);
- }
-
xmlFree(xml_rule);
if (!step || U_FAILURE(*status)){
icu_chain_destroy(chain);
case ICU_chain_step_type_display:
buf16 = src16;
break;
- case ICU_chain_step_type_index:
- buf16 = src16;
- break;
- case ICU_chain_step_type_sortkey:
- buf16 = src16;
- break;
case ICU_chain_step_type_casemap:
buf16 = icu_buf_utf16_create(0);
break;
UErrorCode *status)
{
struct icu_buf_utf16 * src16 = 0;
-
+ int got_new_token = 0;
+
if (!chain || !chain->src16 || !step || !step->more_tokens)
return 0;
/* assign utf16 src buffers as neeed, advance in previous steps
- tokens until non-zero token met, and setting stop condition
- */
+ tokens until non-zero token met, and setting stop condition */
+
if (step->previous){
src16 = step->previous->buf16;
- if (step->need_new_token)
- step->more_tokens
+ /* 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 = 1;
+ step->more_tokens = 0;
+ got_new_token = 1;
}
- /* stop if nothing to process
- i.e new token source was not properly assigned
- */
- if (!step->more_tokens || !src16)
+ if (!src16)
return 0;
- /* perform the work, eventually put this steps output in
+ /* 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_index:
- icu_utf16_to_utf8(chain->norm8, src16, status);
- break;
- case ICU_chain_step_type_sortkey:
- icu_utf16_to_utf8(chain->sort8, src16, status);
- break;
case ICU_chain_step_type_casemap:
icu_casemap_casemap(step->u.casemap,
step->buf16, src16, status);
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 */
- if (step->previous && !step->more_tokens){
- if (icu_chain_step_next_token(chain, step->previous, status)){
- icu_tokenizer_attach(step->u.tokenizer, src16, status);
- step->need_new_token = 0;
- 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!
}
- if (0 == step->more_tokens)
- return 0;
+
break;
default:
return 0;
break;
}
-
-
- /* stop further token processing if last step and
- new tokens are needed from previous (non-existing) step
- */
- if (!step->previous && step->need_new_token)
- step->more_tokens = 0;
-
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;
}
-
int icu_chain_assign_cstr(struct icu_chain * chain,
const char * src8cstr,
UErrorCode *status)
if (!chain || !src8cstr)
return 0;
+ chain->src8cstr = src8cstr;
+
stp = chain->steps;
/* clear token count */
stp = stp->previous;
}
- /* finally convert UTF8 to UTF16 string */
- icu_utf16_from_utf8_cstr(chain->src16, src8cstr, status);
+ /* 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_chain_next_token(struct icu_chain * chain,
UErrorCode *status)
{
- int success = 0;
+ int got_token = 0;
- if (!chain || !chain->steps)
+ *status = U_ZERO_ERROR;
+
+ if (!chain)
return 0;
- success = icu_chain_step_next_token(chain, chain->steps, status);
-
- if (success){
- chain->token_count++;
- return chain->token_count;
+ /* 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;
}
-int icu_chain_get_token_count(struct icu_chain * chain)
+int icu_chain_token_number(struct icu_chain * chain)
{
if (!chain)
return 0;
}
-
-const char * icu_chain_get_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);
return 0;
}
-const char * icu_chain_get_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);
return 0;
}
-const char * icu_chain_get_sort(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);
return 0;
}
+const UCollator * icu_chain_get_coll(struct icu_chain * chain)
+{
+ return chain->coll;
+}
+
+
+
#endif /* HAVE_ICU */
projects / yaz-moved-to-github.git / blobdiff