/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
*/
static void print_icu_transliterators(const struct config_t *p_config)
{
- int32_t buf_cap = 128;
- char buf[128];
- int32_t i;
- int32_t count = utrans_countAvailableIDs();
-
+ UErrorCode status;
+ UEnumeration *en = utrans_openIDs(&status);
+ int32_t count = uenum_count(en, &status);
+ const char *name;
+ int32_t length;
+
if (p_config->xmloutput)
fprintf(config.outfile, "<transliterators count=\"%d\">\n", count);
else
fprintf(config.outfile, "Available ICU transliterators: %d\n", count);
-
- for(i = 0; i <count; i++)
+
+ while ((name = uenum_next(en, &length, &status)))
{
- utrans_getAvailableID(i, buf, buf_cap);
if (p_config->xmloutput)
- fprintf(config.outfile, "<transliterator id=\"%s\"/>\n", buf);
+ fprintf(config.outfile, "<transliterator id=\"%s\"/>\n", name);
else
- fprintf(config.outfile, " %s", buf);
+ fprintf(config.outfile, " %s", name);
}
-
+ uenum_close(en);
if (p_config->xmloutput)
{
fprintf(config.outfile, "</transliterators>\n");
/* read input lines for processing */
while ((line=fgets(linebuf, sizeof(linebuf)-1, config.infile)))
{
+ WRBUF sw = wrbuf_alloc();
+ WRBUF cdata = wrbuf_alloc();
int success = icu_chain_assign_cstr(config.chain, line, &status);
line_count++;
while (success && icu_chain_next_token(config.chain, &status))
{
- WRBUF sw = wrbuf_alloc();
if (U_FAILURE(status))
success = 0;
- else {
+ 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\"",
- token_count,
- line_count,
- icu_chain_token_norm(config.chain),
- icu_chain_token_display(config.chain));
+ "<token id=\"%lu\" line=\"%lu\"",
+ token_count, line_count);
+
+ wrbuf_rewind(cdata);
+ wrbuf_xmlputs(cdata, icu_chain_token_norm(config.chain));
+ fprintf(config.outfile, " norm=\"%s\"",
+ wrbuf_cstr(cdata));
+
+ wrbuf_rewind(cdata);
+ wrbuf_xmlputs(cdata, icu_chain_token_display(config.chain));
+ fprintf(config.outfile, " display=\"%s\"",
+ wrbuf_cstr(cdata));
+
if (p_config->sortoutput)
{
+ wrbuf_rewind(cdata);
+ wrbuf_xmlputs(cdata, wrbuf_cstr(sw));
fprintf(config.outfile, " sortkey=\"%s\"",
- wrbuf_cstr(sw));
+ wrbuf_cstr(cdata));
}
fprintf(config.outfile, "/>\n");
}
fprintf(config.outfile, "\n");
}
}
- wrbuf_destroy(sw);
}
-
+ wrbuf_destroy(sw);
+ wrbuf_destroy(cdata);
}
if (p_config->xmloutput)
- fprintf(config.outfile,
+ fprintf(config.outfile,
"</tokens>\n"
"</icu>\n");
-
+
icu_chain_destroy(config.chain);
xmlFreeDoc(doc);
if (line)
#else /* YAZ_HAVE_ICU */
printf("ICU not available on your system.\n"
- "Please install libicu36-dev and icu-doc or similar, "
+ "Please install libicu-dev and icu-doc or similar, "
"re-configure and re-compile\n");