X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ficu_I18N.h;h=27f7a3aa1c95423749a7ceb69082c0ee3585f8d6;hb=0ff1a97b2a69905755b9adb24a474d30f1c52150;hp=299eb7b961abefc716f5875d0c1d3451d1bc839a;hpb=968c591d366c50df78a3dda223fdb3491cbcb6cd;p=pazpar2-moved-to-github.git

diff --git a/src/icu_I18N.h b/src/icu_I18N.h
index 299eb7b..27f7a3a 100644
--- a/src/icu_I18N.h
+++ b/src/icu_I18N.h
@@ -1,4 +1,4 @@
-/* $Id: icu_I18N.h,v 1.15 2007-05-20 19:00:17 marc Exp $
+/* $Id: icu_I18N.h,v 1.18 2007-09-10 16:05:48 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
    This file is part of Pazpar2.
@@ -22,10 +22,10 @@
 #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 +185,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 +245,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 +281,4 @@ const char * icu_chain_get_sort(struct icu_chain * chain);
 
 
 
-#endif // HAVE_ICU
 #endif // ICU_I18NL_H