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
d929229
..
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.2 2007-10-22 17:32:08 adam 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);
@@
-428,6
+426,7
@@
static void process_text_file(const struct config_t *p_config)
xmlDoc *doc = xmlParseFile(config.conffile);
xmlNode *xml_node = xmlDocGetRootElement(doc);
xmlDoc *doc = xmlParseFile(config.conffile);
xmlNode *xml_node = xmlDocGetRootElement(doc);
+ xmlChar *xml_locale = xmlGetProp(xml_node, (xmlChar *) "locale");
long unsigned int token_count = 0;
long unsigned int line_count = 0;
long unsigned int token_count = 0;
long unsigned int line_count = 0;
@@
-441,8
+440,14
@@
static void process_text_file(const struct config_t *p_config)
exit (1);
}
exit (1);
}
+ if (!xml_locale || !strlen((const char *) xml_locale))
+ return;
- config.chain = icu_chain_xml_config(xml_node, &status);
+ config.chain = icu_chain_xml_config(xml_node, (const char *) xml_locale, 0,
+ &status);
+
+ xmlFree(xml_locale);
+
if (config.chain && U_SUCCESS(status))
success = 1;
if (config.chain && U_SUCCESS(status))
success = 1;
@@
-452,6
+457,8
@@
static void process_text_file(const struct config_t *p_config)
exit (1);
}
exit (1);
}
+
+
if (p_config->xmloutput)
fprintf(config.outfile,
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
if (p_config->xmloutput)
fprintf(config.outfile,
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@
-475,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));
}
}
}
}