to the actually processed token
int icu_chain_token_number(struct icu_chain * chain);
const char * icu_chain_token_display(struct icu_chain * chain);
const char * icu_chain_token_norm(struct icu_chain * chain);
const char * icu_chain_token_sortkey(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);
-const char * icu_chain_get_display(struct icu_chain * chain);
+/*int icu_chain_token_start(struct icu_chain * chain); */
-const char * icu_chain_get_norm(struct icu_chain * chain);
+/*int icu_chain_token_end(struct icu_chain * chain); */
-const char * icu_chain_get_sort(struct icu_chain * chain);
+const char * icu_chain_token_display(struct icu_chain * chain);
+
+const char * icu_chain_token_norm(struct icu_chain * chain);
+
+const char * icu_chain_token_sortkey(struct icu_chain * chain);
const UCollator * icu_chain_get_coll(struct icu_chain * chain);
const UCollator * icu_chain_get_coll(struct icu_chain * chain);
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: icu_I18N.c,v 1.8 2007-10-25 10:04:32 marc Exp $
+ * $Id: icu_I18N.c,v 1.9 2007-10-29 10:22:23 marc Exp $
-int icu_chain_get_token_count(struct icu_chain * chain)
+int icu_chain_token_number(struct icu_chain * chain)
-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);
{
if (chain->display8)
return icu_buf_utf8_to_cstr(chain->display8);
-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->steps)
return chain->src8cstr;
-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);
{
if (chain->sort8)
return icu_buf_utf8_to_cstr(chain->sort8);
-/* $Id: tst_icu_I18N.c,v 1.9 2007-10-25 10:04:33 marc Exp $
+/* $Id: tst_icu_I18N.c,v 1.10 2007-10-29 10:22:23 marc Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
while (icu_chain_next_token(chain, &status)){
;
// printf("%d '%s' '%s'\n",
while (icu_chain_next_token(chain, &status)){
;
// printf("%d '%s' '%s'\n",
- // icu_chain_get_token_count(chain),
- // icu_chain_get_norm(chain),
- // icu_chain_get_display(chain));
+ // icu_chain_token_number(chain),
+ // icu_chain_token_norm(chain),
+ // icu_chain_token_display(chain));
- YAZ_CHECK_EQ(icu_chain_get_token_count(chain), 7);
+ YAZ_CHECK_EQ(icu_chain_token_number(chain), 7);
YAZ_CHECK(icu_chain_assign_cstr(chain, "what is this?", &status));
YAZ_CHECK(icu_chain_assign_cstr(chain, "what is this?", &status));
while (icu_chain_next_token(chain, &status)){
;
//printf("%d '%s' '%s'\n",
while (icu_chain_next_token(chain, &status)){
;
//printf("%d '%s' '%s'\n",
- // icu_chain_get_token_count(chain),
- // icu_chain_get_norm(chain),
- // icu_chain_get_display(chain));
+ // icu_chain_token_number(chain),
+ // icu_chain_token_norm(chain),
+ // icu_chain_token_display(chain));
- YAZ_CHECK_EQ(icu_chain_get_token_count(chain), 3);
+ YAZ_CHECK_EQ(icu_chain_token_number(chain), 3);
icu_chain_destroy(chain);
}
icu_chain_destroy(chain);
}
while (icu_chain_next_token(chain, &status)){
;
//printf("%d '%s' '%s'\n",
while (icu_chain_next_token(chain, &status)){
;
//printf("%d '%s' '%s'\n",
- // icu_chain_get_token_count(chain),
- // icu_chain_get_norm(chain),
- // icu_chain_get_display(chain));
+ // icu_chain_token_number(chain),
+ // icu_chain_token_norm(chain),
+ // icu_chain_token_display(chain));
- YAZ_CHECK_EQ(icu_chain_get_token_count(chain), 7);
+ YAZ_CHECK_EQ(icu_chain_token_number(chain), 7);
YAZ_CHECK(icu_chain_assign_cstr(chain, "what is this?", &status));
while (icu_chain_next_token(chain, &status)){
;
//printf("%d '%s' '%s'\n",
YAZ_CHECK(icu_chain_assign_cstr(chain, "what is this?", &status));
while (icu_chain_next_token(chain, &status)){
;
//printf("%d '%s' '%s'\n",
- // icu_chain_get_token_count(chain),
- // icu_chain_get_norm(chain),
- // icu_chain_get_display(chain));
+ // icu_chain_token_number(chain),
+ // icu_chain_token_norm(chain),
+ // icu_chain_token_display(chain));
}
/* we expect 'what' 'is' 'this', i.e. 3 tokens */
}
/* we expect 'what' 'is' 'this', i.e. 3 tokens */
- YAZ_CHECK_EQ(icu_chain_get_token_count(chain), 3);
+ YAZ_CHECK_EQ(icu_chain_token_number(chain), 3);
icu_chain_destroy(chain);
}
icu_chain_destroy(chain);
}
while (icu_chain_next_token(chain, &status)){
;
//printf("%d '%s' '%s'\n",
while (icu_chain_next_token(chain, &status)){
;
//printf("%d '%s' '%s'\n",
- // icu_chain_get_token_count(chain),
- // icu_chain_get_norm(chain),
- // icu_chain_get_display(chain));
+ // icu_chain_token_number(chain),
+ // icu_chain_token_norm(chain),
+ // icu_chain_token_display(chain));
- YAZ_CHECK_EQ(icu_chain_get_token_count(chain), 8);
+ YAZ_CHECK_EQ(icu_chain_token_number(chain), 8);
icu_chain_destroy(chain);
}
icu_chain_destroy(chain);
}
while (icu_chain_next_token(chain, &status)){
;
//printf("%d '%s' '%s'\n",
while (icu_chain_next_token(chain, &status)){
;
//printf("%d '%s' '%s'\n",
- // icu_chain_get_token_count(chain),
- // icu_chain_get_norm(chain),
- // icu_chain_get_display(chain));
+ // icu_chain_token_number(chain),
+ // icu_chain_token_norm(chain),
+ // icu_chain_token_display(chain));
- YAZ_CHECK_EQ(icu_chain_get_token_count(chain), 1);
+ YAZ_CHECK_EQ(icu_chain_token_number(chain), 1);
- dest8 = icu_chain_get_norm(chain);
+ dest8 = icu_chain_token_norm(chain);
YAZ_CHECK_EQ(strcmp(src8, dest8), 0);
YAZ_CHECK_EQ(strcmp(src8, dest8), 0);
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: yaz-icu.c,v 1.5 2007-10-25 08:40:06 marc Exp $
+ * $Id: yaz-icu.c,v 1.6 2007-10-29 10:22:23 marc Exp $
" norm=\"%s\" display=\"%s\"/>\n",
token_count,
line_count,
" norm=\"%s\" display=\"%s\"/>\n",
token_count,
line_count,
- icu_chain_get_norm(config.chain),
- icu_chain_get_display(config.chain));
+ icu_chain_token_norm(config.chain),
+ icu_chain_token_display(config.chain));
else
fprintf(config.outfile, "%lu %lu '%s' '%s'\n",
token_count,
line_count,
else
fprintf(config.outfile, "%lu %lu '%s' '%s'\n",
token_count,
line_count,
- icu_chain_get_norm(config.chain),
- icu_chain_get_display(config.chain));
+ icu_chain_token_norm(config.chain),
+ icu_chain_token_display(config.chain));