X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_icu_I18N.c;h=6450c8a3dfb63e78beffbc594f0d56c12f986fc6;hb=0ff1a97b2a69905755b9adb24a474d30f1c52150;hp=27b816a8ac833c908f43888dc75641261ce76d4d;hpb=06ec84ec5e71464bbdb286b0548483b97147be81;p=pazpar2-moved-to-github.git

diff --git a/src/test_icu_I18N.c b/src/test_icu_I18N.c
index 27b816a..6450c8a 100644
--- a/src/test_icu_I18N.c
+++ b/src/test_icu_I18N.c
@@ -1,4 +1,4 @@
-/* $Id: test_icu_I18N.c,v 1.25 2007-05-24 10:35:21 adam Exp $
+/* $Id: test_icu_I18N.c,v 1.27 2007-05-25 13:27:21 marc Exp $
    Copyright (c) 2006-2007, Index Data.
 
    This file is part of Pazpar2.
@@ -513,8 +513,8 @@ void test_icu_I18N_chain(int argc, char **argv)
         "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
         "<display/>"
         "<casemap rule=\"l\"/>"
-        "<normal/>"
-        "<sort/>"
+        "<index/>"
+        "<sortkey/>"
         "</icu_chain>";
 
     
@@ -549,10 +549,10 @@ void test_icu_I18N_chain(int argc, char **argv)
     step = icu_chain_insert_step(chain, ICU_chain_step_type_casemap,
                                  (const uint8_t *) "l",
                                  &status);
-    step = icu_chain_insert_step(chain, ICU_chain_step_type_norm,
+    step = icu_chain_insert_step(chain, ICU_chain_step_type_index,
                                  (const uint8_t *)"",
                                  &status);
-/*     step = icu_chain_insert_step(chain, ICU_chain_step_type_sort, */
+/*     step = icu_chain_insert_step(chain, ICU_chain_step_type_sortkey, */
 /*                                  (const uint8_t *)"", */
 /*                                  &status); */
     
@@ -610,8 +610,8 @@ void test_bug_1140(void)
         "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
         "<display/>"
         "<casemap rule=\"l\"/>"
-        "<normal/>"
-        "<sort/>"
+        "<index/>"
+        "<sortkey/>"
         "</icu_chain>";
 
     
@@ -666,10 +666,7 @@ int main(int argc, char **argv)
     test_icu_I18N_normalizer(argc, argv);
     test_icu_I18N_tokenizer(argc, argv);
     test_icu_I18N_chain(argc, argv);
-#if 0
-    /* currently fails */
     test_bug_1140();
-#endif
 
 #else // HAVE_ICU