X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Ficu_I18N.h;h=61dbf70e995b9286d6a8755bb72f1a70822d9244;hb=297aa7b45c3bd88aea2799f6810c8c85bc998f56;hp=4e80ad1cbec9f1df13697a2b5a01fe78051fbef5;hpb=ee2314e5828aac6055031f9ed4441eb9852ec27c;p=yaz-moved-to-github.git

diff --git a/include/yaz/icu_I18N.h b/include/yaz/icu_I18N.h
index 4e80ad1..61dbf70 100644
--- a/include/yaz/icu_I18N.h
+++ b/include/yaz/icu_I18N.h
@@ -41,9 +41,6 @@
 #include <unicode/utrans.h>
 
 
-// #define ICU_CHAIN_SORTKEY
-#undef ICU_CHAIN_SORTKEY
-
 /* declared structs and functions */
 
 int icu_check_status (UErrorCode status);
@@ -187,10 +184,6 @@ int icu_normalizer_normalize(struct icu_normalizer * normalizer,
 enum icu_chain_step_type {
     ICU_chain_step_type_none,
     ICU_chain_step_type_display,   /* convert to utf8 display format */
-#ifdef ICU_CHAIN_SORTKEY
-    ICU_chain_step_type_index,     /* convert to utf8 index format  */
-    ICU_chain_step_type_sortkey,   /* convert to utf8 sortkey format */
-#endif
     ICU_chain_step_type_casemap,   /* apply utf16 charmap */
     ICU_chain_step_type_normalize, /* apply utf16 normalization */
     ICU_chain_step_type_tokenize   /* apply utf16 tokenization */
@@ -232,6 +225,8 @@ struct icu_chain
     uint8_t locale[16];
     int sort;
 
+    const char * src8cstr;
+
     UCollator * coll;
     
     /* number of tokens returned so far */
@@ -276,13 +271,17 @@ int icu_chain_assign_cstr(struct icu_chain * chain,
 int icu_chain_next_token(struct icu_chain * chain,
                          UErrorCode *status);
 
-int icu_chain_get_token_count(struct icu_chain * chain);
+int icu_chain_token_number(struct icu_chain * chain);
+
+/*int icu_chain_token_start(struct icu_chain * chain); */
+
+/*int icu_chain_token_end(struct icu_chain * chain); */
 
-const char * icu_chain_get_display(struct icu_chain * chain);
+const char * icu_chain_token_display(struct icu_chain * chain);
 
-const char * icu_chain_get_norm(struct icu_chain * chain);
+const char * icu_chain_token_norm(struct icu_chain * chain);
 
-const char * icu_chain_get_sort(struct icu_chain * chain);
+const char * icu_chain_token_sortkey(struct icu_chain * chain);
 
 const UCollator * icu_chain_get_coll(struct icu_chain * chain);