-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
- *
- * $Id: yaz-icu.c,v 1.13 2007-11-12 11:11:16 adam Exp $
*/
#if HAVE_CONFIG_H
#include <unicode/utrans.h>
#include <yaz/icu.h>
+#include <yaz/wrbuf.h>
/* commando line and config parameters */
static struct config_t {
static void print_icu_transliterators(const struct config_t *p_config)
{
int32_t buf_cap = 128;
- char buf[buf_cap];
+ char buf[128];
int32_t i;
int32_t count = utrans_countAvailableIDs();
if(U_FAILURE(status))
{
fprintf(stderr, "ICU Error: %d %s\n", status, u_errorName(status));
- exit(status);
+ exit(2);
}
}
UErrorCode status = U_ZERO_ERROR;
int success = 0;
- if (! xml_node)
+ if (!xml_node)
{
printf("Could not parse XML config file '%s' \n",
config.conffile);
- exit (1);
+ exit(1);
}
- config.chain = icu_chain_xml_config(xml_node, 0, &status);
+ config.chain = icu_chain_xml_config(xml_node, 1, &status);
if (config.chain && U_SUCCESS(status))
success = 1;
else {
printf("Could not set up ICU chain from config file '%s' \n",
config.conffile);
- exit (1);
+ exit(1);
}
if (p_config->xmloutput)
while (success && icu_chain_next_token(config.chain, &status))
{
+ WRBUF sw = wrbuf_alloc();
if (U_FAILURE(status))
success = 0;
else {
+ const char *sortkey = icu_chain_token_sortkey(config.chain);
+ wrbuf_rewind(sw);
+ wrbuf_puts_escaped(sw, sortkey);
token_count++;
if (p_config->xmloutput)
+ {
+ /* should XML encode this. Bug #1902 */
fprintf(config.outfile,
- "<token id=\%lu\" line=\"%lu\""
- " norm=\"%s\" display=\"%s\"/>\n",
+ "<token id=\"%lu\" line=\"%lu\""
+ " norm=\"%s\" display=\"%s\" sortkey=\"%s\"/>\n",
token_count,
line_count,
icu_chain_token_norm(config.chain),
- icu_chain_token_display(config.chain));
+ icu_chain_token_display(config.chain),
+ wrbuf_cstr(sw));
+ }
else
- fprintf(config.outfile, "%lu %lu '%s' '%s'\n",
+ fprintf(config.outfile, "%lu %lu '%s' '%s' '%s'\n",
token_count,
line_count,
icu_chain_token_norm(config.chain),
- icu_chain_token_display(config.chain));
+ icu_chain_token_display(config.chain),
+ wrbuf_cstr(sw));
}
+ wrbuf_destroy(sw);
}
}
"re-configure and re-compile\n");
+ exit(3);
#endif /* YAZ_HAVE_ICU */
- return(0);
+ return 0;
}