From 7e025de4cfed622c3bcd95c99fd6e90e71cb05fc Mon Sep 17 00:00:00 2001 From: Marc Cromme Date: Fri, 25 May 2007 13:27:21 +0000 Subject: [PATCH] renamed instruction 'norm' to 'index' and 'sort' to sortkey'. otherwise no changes --- etc/pazpar2icu.cfg.dist | 3 +-- src/icu_I18N.c | 26 +++++++++++++------------- src/icu_I18N.h | 6 +++--- src/test_icu_I18N.c | 14 +++++++------- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/etc/pazpar2icu.cfg.dist b/etc/pazpar2icu.cfg.dist index f3d84ad..ba69ec3 100644 --- a/etc/pazpar2icu.cfg.dist +++ b/etc/pazpar2icu.cfg.dist @@ -13,8 +13,7 @@ - - + diff --git a/src/icu_I18N.c b/src/icu_I18N.c index a1ff12c..1d08d5a 100644 --- a/src/icu_I18N.c +++ b/src/icu_I18N.c @@ -1,4 +1,4 @@ -/* $Id: icu_I18N.c,v 1.21 2007-05-24 10:56:38 adam Exp $ +/* $Id: icu_I18N.c,v 1.22 2007-05-25 13:27:21 marc Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -776,9 +776,9 @@ struct icu_chain_step * icu_chain_step_create(struct icu_chain * chain, switch(step->type) { case ICU_chain_step_type_display: break; - case ICU_chain_step_type_norm: + case ICU_chain_step_type_index: break; - case ICU_chain_step_type_sort: + case ICU_chain_step_type_sortkey: break; case ICU_chain_step_type_casemap: step->u.casemap = icu_casemap_create((char *) chain->locale, @@ -809,9 +809,9 @@ void icu_chain_step_destroy(struct icu_chain_step * step){ switch(step->type) { case ICU_chain_step_type_display: break; - case ICU_chain_step_type_norm: + case ICU_chain_step_type_index: break; - case ICU_chain_step_type_sort: + case ICU_chain_step_type_sortkey: break; case ICU_chain_step_type_casemap: icu_casemap_destroy(step->u.casemap); @@ -931,13 +931,13 @@ struct icu_chain * icu_chain_xml_config(xmlNode *xml_node, (const uint8_t *) "", status); } else if (!strcmp((const char *) node->name, - (const char *) "normal")){ - step = icu_chain_insert_step(chain, ICU_chain_step_type_norm, + (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 *) "sort")){ - step = icu_chain_insert_step(chain, ICU_chain_step_type_sort, + (const char *) "sortkey")){ + step = icu_chain_insert_step(chain, ICU_chain_step_type_sortkey, (const uint8_t *) "", status); } @@ -981,10 +981,10 @@ struct icu_chain_step * icu_chain_insert_step(struct icu_chain * chain, case ICU_chain_step_type_display: buf16 = src16; break; - case ICU_chain_step_type_norm: + case ICU_chain_step_type_index: buf16 = src16; break; - case ICU_chain_step_type_sort: + case ICU_chain_step_type_sortkey: buf16 = src16; break; case ICU_chain_step_type_casemap: @@ -1049,10 +1049,10 @@ int icu_chain_step_next_token(struct icu_chain * chain, case ICU_chain_step_type_display: icu_utf16_to_utf8(chain->display8, src16, status); break; - case ICU_chain_step_type_norm: + case ICU_chain_step_type_index: icu_utf16_to_utf8(chain->norm8, src16, status); break; - case ICU_chain_step_type_sort: + case ICU_chain_step_type_sortkey: icu_utf16_to_utf8(chain->sort8, src16, status); break; case ICU_chain_step_type_casemap: diff --git a/src/icu_I18N.h b/src/icu_I18N.h index 8ad7b11..22d77af 100644 --- a/src/icu_I18N.h +++ b/src/icu_I18N.h @@ -1,4 +1,4 @@ -/* $Id: icu_I18N.h,v 1.16 2007-05-21 10:14:08 marc Exp $ +/* $Id: icu_I18N.h,v 1.17 2007-05-25 13:27:21 marc Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -187,8 +187,8 @@ struct icu_token enum icu_chain_step_type { ICU_chain_step_type_none, // ICU_chain_step_type_display, // convert to utf8 display format - ICU_chain_step_type_norm, // convert to utf8 norm format - ICU_chain_step_type_sort, // convert to utf8 sort 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 diff --git a/src/test_icu_I18N.c b/src/test_icu_I18N.c index d44a5e1..6450c8a 100644 --- a/src/test_icu_I18N.c +++ b/src/test_icu_I18N.c @@ -1,4 +1,4 @@ -/* $Id: test_icu_I18N.c,v 1.26 2007-05-24 10:52:36 adam Exp $ +/* $Id: test_icu_I18N.c,v 1.27 2007-05-25 13:27:21 marc Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -513,8 +513,8 @@ void test_icu_I18N_chain(int argc, char **argv) "" "" "" - "" - "" + "" + "" ""; @@ -549,10 +549,10 @@ void test_icu_I18N_chain(int argc, char **argv) step = icu_chain_insert_step(chain, ICU_chain_step_type_casemap, (const uint8_t *) "l", &status); - step = icu_chain_insert_step(chain, ICU_chain_step_type_norm, + step = icu_chain_insert_step(chain, ICU_chain_step_type_index, (const uint8_t *)"", &status); -/* step = icu_chain_insert_step(chain, ICU_chain_step_type_sort, */ +/* step = icu_chain_insert_step(chain, ICU_chain_step_type_sortkey, */ /* (const uint8_t *)"", */ /* &status); */ @@ -610,8 +610,8 @@ void test_bug_1140(void) "" "" "" - "" - "" + "" + "" ""; -- 1.7.10.4