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
For ICU, locale, is a char ptr rather than uint8_t ptr.
[yaz-moved-to-github.git]
/
util
/
yaz-icu.c
diff --git
a/util/yaz-icu.c
b/util/yaz-icu.c
index
df78e91
..
ff249e0
100644
(file)
--- a/
util/yaz-icu.c
+++ b/
util/yaz-icu.c
@@
-2,7
+2,7
@@
* 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.4 2007-10-25 08:32:51 marc Exp $
+ * $Id: yaz-icu.c,v 1.7 2007-11-06 10:27:30 adam Exp $
*/
#if HAVE_CONFIG_H
*/
#if HAVE_CONFIG_H
@@
-57,8
+57,6
@@
void print_option_error(const struct config_t *p_config)
" <normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>\n"
" <display/>\n"
" <casemap rule=\"l\"/>\n"
" <normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>\n"
" <display/>\n"
" <casemap rule=\"l\"/>\n"
- " <index/>\n"
- " <sortkey/>\n"
"</icu_chain>\n"
);
exit(1);
"</icu_chain>\n"
);
exit(1);
@@
-445,7
+443,7
@@
static void process_text_file(const struct config_t *p_config)
if (!xml_locale || !strlen((const char *) xml_locale))
return;
if (!xml_locale || !strlen((const char *) xml_locale))
return;
- config.chain = icu_chain_xml_config(xml_node, (uint8_t *) xml_locale, 0,
+ config.chain = icu_chain_xml_config(xml_node, (const char *) xml_locale, 0,
&status);
xmlFree(xml_locale);
&status);
xmlFree(xml_locale);
@@
-484,14
+482,14
@@
static void process_text_file(const struct config_t *p_config)
" 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));
}
}
}
}