ICU element index and sortkey no longer available.

[yaz-moved-to-github.git] / util / yaz-icu.c

diff --git a/util/yaz-icu.c b/util/yaz-icu.c
index a876186..dd97249 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.
  *
- * $Id: yaz-icu.c,v 1.3 2007-10-24 14:48:18 marc Exp $
+ * $Id: yaz-icu.c,v 1.8 2007-11-07 09:50:24 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -55,10 +55,7 @@ void print_option_error(const struct config_t *p_config)
             "  <normalize rule=\"[:Control:] Any-Remove\"/>\n"
             "  <tokenize rule=\"l\"/>\n"
             "  <normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>\n"
-            "  <display/>\n"
             "  <casemap rule=\"l\"/>\n"
-            "  <index/>\n"
-            "  <sortkey/>\n"
             "</icu_chain>\n"
           );
     exit(1);
@@ -445,7 +442,8 @@ static void process_text_file(const struct config_t *p_config)
     if (!xml_locale || !strlen((const char *) xml_locale))
         return;        
     
-    config.chain = icu_chain_xml_config(xml_node, (uint8_t *) "en", &status);
+    config.chain = icu_chain_xml_config(xml_node, (const char *) xml_locale, 0,
+                                        &status);
 
     xmlFree(xml_locale);
 
@@ -483,14 +481,14 @@ static void process_text_file(const struct config_t *p_config)
                             " 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,
-                            icu_chain_get_norm(config.chain),
-                            icu_chain_get_display(config.chain));
+                            icu_chain_token_norm(config.chain),
+                            icu_chain_token_display(config.chain));
             }
         }