X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_icu_I18N.c;h=bc55d7d38a6b439542fcd0eec3a659f86f509464;hb=3de3ea11e6756214a2e2d1e8f3631aac10ec266c;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..bc55d7d 100644
--- a/src/test_icu_I18N.c
+++ b/src/test_icu_I18N.c
@@ -1,29 +1,27 @@
-/* $Id: test_icu_I18N.c,v 1.25 2007-05-24 10:35:21 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 Index Data
 
-   This file is part of Pazpar2.
+Pazpar2 is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
 
-   Pazpar2 is free software; you can redistribute it and/or modify it under
-   the terms of the GNU General Public License as published by the Free
-   Software Foundation; either version 2, or (at your option) any later
-   version.
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
-   Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-   You should have received a copy of the GNU General Public License
-   along with Pazpar2; see the file LICENSE.  If not, write to the
-   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
 */
 
 // DO NOT EDIT THIS FILE IF YOUR EDITOR DOES NOT SUPPORT UTF-8
  
 
 #if HAVE_CONFIG_H
-#include "cconfig.h"
+#include <config.h>
 #endif
 
 #define USE_TIMING 0
@@ -513,8 +511,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 +547,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 +608,8 @@ void test_bug_1140(void)
         "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
         "<display/>"
         "<casemap rule=\"l\"/>"
-        "<normal/>"
-        "<sort/>"
+        "<index/>"
+        "<sortkey/>"
         "</icu_chain>";
 
     
@@ -666,10 +664,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