X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ficu_I18N.h;h=27f7a3aa1c95423749a7ceb69082c0ee3585f8d6;hb=f0a99450efe81ff4d4a941801a92bc99d2544ebb;hp=ff6bf3102ce3c8f90b76bca520e489ff22f402eb;hpb=6f08d24c048052306511961bb9710694f07b5528;p=pazpar2-moved-to-github.git

diff --git a/src/icu_I18N.h b/src/icu_I18N.h
index ff6bf31..27f7a3a 100644
--- a/src/icu_I18N.h
+++ b/src/icu_I18N.h
@@ -1,4 +1,4 @@
-/* $Id: icu_I18N.h,v 1.13 2007-05-15 15:11:42 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           */
@@ -87,6 +87,22 @@ UErrorCode icu_utf16_to_utf8(struct icu_buf_utf8 * dest8,
                              struct icu_buf_utf16 * src16,
                              UErrorCode * status);
 
+struct icu_casemap
+{
+  char locale[16];
+  char action;
+};
+
+struct icu_casemap * icu_casemap_create(const char *locale, char action,
+                                            UErrorCode *status);
+
+void icu_casemap_destroy(struct icu_casemap * casemap);
+
+int icu_casemap_casemap(struct icu_casemap * casemap,
+                        struct icu_buf_utf16 * dest16,
+                        struct icu_buf_utf16 * src16,
+                        UErrorCode *status);
+
 int icu_utf16_casemap(struct icu_buf_utf16 * dest16,
                       struct icu_buf_utf16 * src16,
                       const char *locale, char action,
@@ -165,12 +181,13 @@ struct icu_token
 }
 #endif
 
+
 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_charmap,   // apply utf16 charmap
+    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 
 };
@@ -182,13 +199,15 @@ struct icu_chain_step
   // type and action object
   enum icu_chain_step_type type;
   union {
+    struct icu_casemap * casemap;
     struct icu_normalizer * normalizer;
     struct icu_tokenizer * tokenizer;  
   } u;
   // temprary post-action utf16 buffer
-  struct icu_buf_utf16 * src16;  
+  struct icu_buf_utf16 * buf16;  
   struct icu_chain_step * previous;
-  int end_of_tokens;
+  int more_tokens;
+  int need_new_token;
 };
 
 
@@ -197,7 +216,7 @@ struct icu_chain;
 struct icu_chain_step * icu_chain_step_create(struct icu_chain * chain,
                                               enum icu_chain_step_type type,
                                               const uint8_t * rule,
-                                              struct icu_buf_utf16 * src16,
+                                              struct icu_buf_utf16 * buf16,
                                               UErrorCode *status);
 
 
@@ -229,13 +248,37 @@ struct icu_chain * icu_chain_create(const uint8_t * identifier,
 
 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,
                                               UErrorCode *status);
 
 
+int icu_chain_step_next_token(struct icu_chain * chain,
+                              struct icu_chain_step * step,
+                              UErrorCode *status);
+
+int icu_chain_assign_cstr(struct icu_chain * chain,
+                          const char * src8cstr, 
+                          UErrorCode *status);
+
+int icu_chain_next_token(struct icu_chain * chain,
+                         UErrorCode *status);
+
+int icu_chain_get_token_count(struct icu_chain * chain);
+
+const char * icu_chain_get_display(struct icu_chain * chain);
+
+const char * icu_chain_get_norm(struct icu_chain * chain);
+
+const char * icu_chain_get_sort(struct icu_chain * chain);
+
+
+
 
 
-#endif // HAVE_ICU
 #endif // ICU_I18NL_H