X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ficu_I18N.h;h=dab51fca2863d0015c8bac7fd309ee882ee67c9f;hb=e107b0011a295ccc61502d6e5ea79d9125a3fbb4;hp=299eb7b961abefc716f5875d0c1d3451d1bc839a;hpb=968c591d366c50df78a3dda223fdb3491cbcb6cd;p=pazpar2-moved-to-github.git

diff --git a/src/icu_I18N.h b/src/icu_I18N.h
index 299eb7b..dab51fc 100644
--- a/src/icu_I18N.h
+++ b/src/icu_I18N.h
@@ -1,31 +1,29 @@
-/* $Id: icu_I18N.h,v 1.15 2007-05-20 19:00:17 marc 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.
 */
 
 #ifndef ICU_I18NL_H
 #define ICU_I18NL_H
 
-#ifdef HAVE_ICU
-
 #include <yaz/nmem.h>
 
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
 #include <unicode/utypes.h>   /* Basic ICU data types */
 #include <unicode/uchar.h>    /* char names           */
@@ -185,8 +183,8 @@ struct icu_token
 enum icu_chain_step_type {
     ICU_chain_step_type_none,      // 
     ICU_chain_step_type_display,   // convert to utf8 display format 
-    ICU_chain_step_type_norm,      // convert to utf8 norm format 
-    ICU_chain_step_type_sort,      // convert to utf8 sort format 
+    ICU_chain_step_type_index,     // convert to utf8 index format 
+    ICU_chain_step_type_sortkey,   // convert to utf8 sortkey format 
     ICU_chain_step_type_casemap,   // apply utf16 charmap
     ICU_chain_step_type_normalize, // apply utf16 normalization
     ICU_chain_step_type_tokenize   // apply utf16 tokenization 
@@ -245,8 +243,13 @@ struct icu_chain
 
 struct icu_chain * icu_chain_create(const uint8_t * identifier, 
                                     const uint8_t * locale);
+
 void icu_chain_destroy(struct icu_chain * chain);
 
+struct icu_chain * icu_chain_xml_config(xmlNode *xml_node, 
+                                        UErrorCode * status);
+
+
 struct icu_chain_step * icu_chain_insert_step(struct icu_chain * chain,
                                               enum icu_chain_step_type type,
                                               const uint8_t * rule,
@@ -276,5 +279,4 @@ const char * icu_chain_get_sort(struct icu_chain * chain);
 
 
 
-#endif // HAVE_ICU
 #endif // ICU_I18NL_H