* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: icu_I18N.c,v 1.7 2007-10-25 08:40:06 marc Exp $
+ * $Id: icu_I18N.c,v 1.8 2007-10-25 10:04:32 marc Exp $
*/
#if HAVE_CONFIG_H
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->steps = 0;
-
return chain;
}
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 got_token = 0;
- if (!chain || !chain->steps)
+ if (!chain)
return 0;
- while(!got_token && 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);
+ /* 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 {
- icu_sortkey8_from_utf16(chain->coll,
- chain->sort8, chain->steps->buf16, status);
+ 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++;
- return 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;
}
}
-
const char * icu_chain_get_display(struct icu_chain * chain)
{
if (chain->display8)
const char * icu_chain_get_norm(struct icu_chain * chain)
{
+ if (!chain->steps)
+ return chain->src8cstr;
+
if (chain->norm8)
return icu_buf_utf8_to_cstr(chain->norm8);