projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed ICU chain functions to the following names relation the operation
[yaz-moved-to-github.git]
/
include
/
yaz
/
icu_I18N.h
diff --git
a/include/yaz/icu_I18N.h
b/include/yaz/icu_I18N.h
index
7436b2e
..
61dbf70
100644
(file)
--- a/
include/yaz/icu_I18N.h
+++ b/
include/yaz/icu_I18N.h
@@
-41,7
+41,6
@@
#include <unicode/utrans.h>
#include <unicode/utrans.h>
-
/* declared structs and functions */
int icu_check_status (UErrorCode status);
/* declared structs and functions */
int icu_check_status (UErrorCode status);
@@
-185,8
+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 */
enum icu_chain_step_type {
ICU_chain_step_type_none,
ICU_chain_step_type_display, /* convert to utf8 display format */
- ICU_chain_step_type_index, /* convert to utf8 index format */
- ICU_chain_step_type_sortkey, /* convert to utf8 sortkey format */
ICU_chain_step_type_casemap, /* apply utf16 charmap */
ICU_chain_step_type_normalize, /* apply utf16 normalization */
ICU_chain_step_type_tokenize /* apply utf16 tokenization */
ICU_chain_step_type_casemap, /* apply utf16 charmap */
ICU_chain_step_type_normalize, /* apply utf16 normalization */
ICU_chain_step_type_tokenize /* apply utf16 tokenization */
@@
-225,8
+222,12
@@
void icu_chain_step_destroy(struct icu_chain_step * step);
struct icu_chain
{
struct icu_chain
{
- uint8_t identifier[128];
uint8_t locale[16];
uint8_t locale[16];
+ int sort;
+
+ const char * src8cstr;
+
+ UCollator * coll;
/* number of tokens returned so far */
int32_t token_count;
/* number of tokens returned so far */
int32_t token_count;
@@
-243,21
+244,22
@@
struct icu_chain
struct icu_chain_step * steps;
};
struct icu_chain_step * steps;
};
-struct icu_chain * icu_chain_create(const uint8_t * identifier,
- const uint8_t * locale);
+struct icu_chain * icu_chain_create(const uint8_t * locale,
+ int sort,
+ UErrorCode * status);
void icu_chain_destroy(struct icu_chain * chain);
void icu_chain_destroy(struct icu_chain * chain);
-struct icu_chain * icu_chain_xml_config(xmlNode *xml_node,
+struct icu_chain * icu_chain_xml_config(xmlNode *xml_node,
+ const uint8_t * locale,
+ int sort,
UErrorCode * status);
UErrorCode * status);
-
struct icu_chain_step * icu_chain_insert_step(struct icu_chain * chain,
enum icu_chain_step_type type,
const uint8_t * rule,
UErrorCode *status);
struct icu_chain_step * icu_chain_insert_step(struct icu_chain * chain,
enum icu_chain_step_type type,
const uint8_t * rule,
UErrorCode *status);
-
int icu_chain_step_next_token(struct icu_chain * chain,
struct icu_chain_step * step,
UErrorCode *status);
int icu_chain_step_next_token(struct icu_chain * chain,
struct icu_chain_step * step,
UErrorCode *status);
@@
-269,13
+271,19
@@
int icu_chain_assign_cstr(struct icu_chain * chain,
int icu_chain_next_token(struct icu_chain * chain,
UErrorCode *status);
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_token_display(struct icu_chain * chain);
-const char * icu_chain_get_display(struct icu_chain * chain);
+const char * icu_chain_token_norm(struct icu_chain * chain);
-const char * icu_chain_get_norm(struct icu_chain * chain);
+const char * icu_chain_token_sortkey(struct icu_chain * chain);
-const char * icu_chain_get_sort(struct icu_chain * chain);
+const UCollator * icu_chain_get_coll(struct icu_chain * chain);
#endif /* ICU_I18NL_H */
#endif /* ICU_I18NL_H */