X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ficu_chain_test.c;h=de137fd78f917869f2b8ca8f5996b409378194b7;hb=e2f1361ffc2468fe4127a9759691d6b66f5983f6;hp=192d28cc4e2b341d29679837a058c5e43933c86d;hpb=941107ab62dc3972a050c569b7b4e657dcc582a5;p=pazpar2-moved-to-github.git
diff --git a/src/icu_chain_test.c b/src/icu_chain_test.c
index 192d28c..de137fd 100644
--- a/src/icu_chain_test.c
+++ b/src/icu_chain_test.c
@@ -1,4 +1,4 @@
-/* $Id: icu_chain_test.c,v 1.6 2007-07-05 18:40:24 adam Exp $
+/* $Id: icu_chain_test.c,v 1.7 2007-08-30 08:45:08 marc Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
@@ -64,6 +64,17 @@ void print_option_error(const struct config_t *p_config)
"./icu_chain_test -p c\n"
"./icu_chain_test -p l -x\n"
"./icu_chain_test -p t -x\n"
+ "\n"
+ "Example ICU chain XML configuration file:\n"
+ "\n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ "\n"
);
exit(1);
}
@@ -139,12 +150,14 @@ static void print_icu_converters(const struct config_t *p_config)
count, ucnv_getDefaultName());
else {
fprintf(config.outfile, "Available ICU converters: %d\n", count);
- fprintf(config.outfile, "Default ICU Converter is: '%s'\n", ucnv_getDefaultName());
+ fprintf(config.outfile, "Default ICU Converter is: '%s'\n",
+ ucnv_getDefaultName());
}
for(i=0;ixmloutput)
- fprintf(config.outfile, "\n", ucnv_getAvailableName(i));
+ fprintf(config.outfile, "\n",
+ ucnv_getAvailableName(i));
else
fprintf(config.outfile, "%s ", ucnv_getAvailableName(i));
}
@@ -440,12 +453,23 @@ static void process_text_file(const struct config_t *p_config)
UErrorCode status = U_ZERO_ERROR;
int success = 0;
+ if (! xml_node) {
+ printf("Could not parse XML config file '%s' \n",
+ config.conffile);
+ exit (1);
+ }
+
config.chain = icu_chain_xml_config(xml_node, &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);
+ }
+
if (p_config->xmloutput)
fprintf(config.outfile,
"\n"