X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ficu_I18N.c;h=a4aa2445d61781d3bcb01cd4dba2857e08ee7806;hb=297aa7b45c3bd88aea2799f6810c8c85bc998f56;hp=305316e44190ee1f43787eb05e81cc87cb1b96c3;hpb=ee2314e5828aac6055031f9ed4441eb9852ec27c;p=yaz-moved-to-github.git

diff --git a/src/icu_I18N.c b/src/icu_I18N.c
index 305316e..a4aa244 100644
--- a/src/icu_I18N.c
+++ b/src/icu_I18N.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: icu_I18N.c,v 1.6 2007-10-25 08:32:50 marc Exp $
+ * $Id: icu_I18N.c,v 1.9 2007-10-29 10:22:23 marc Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -801,12 +801,6 @@ struct icu_chain_step * icu_chain_step_create(struct icu_chain * chain,
     switch(step->type) {
     case ICU_chain_step_type_display:
         break;
-#ifdef ICU_CHAIN_SORTKEY
-    case ICU_chain_step_type_index:
-        break;
-    case ICU_chain_step_type_sortkey:
-        break;
-#endif
     case ICU_chain_step_type_casemap:
         step->u.casemap = icu_casemap_create((char *) chain->locale, 
                                              (char) rule[0], status);
@@ -836,12 +830,6 @@ void icu_chain_step_destroy(struct icu_chain_step * step){
     switch(step->type) {
     case ICU_chain_step_type_display:
         break;
-#ifdef ICU_CHAIN_SORTKEY
-    case ICU_chain_step_type_index:
-        break;
-    case ICU_chain_step_type_sortkey:
-        break;
-#endif
     case ICU_chain_step_type_casemap:
         icu_casemap_destroy(step->u.casemap);
         icu_buf_utf16_destroy(step->buf16);
@@ -883,6 +871,8 @@ struct icu_chain * icu_chain_create(const uint8_t * locale,
 
     chain->token_count = 0;
 
+    chain->src8cstr = 0;
+
     chain->display8 = icu_buf_utf8_create(0);
     chain->norm8 = icu_buf_utf8_create(0);
     chain->sort8 = icu_buf_utf8_create(0);
@@ -891,7 +881,6 @@ struct icu_chain * icu_chain_create(const uint8_t * locale,
 
     chain->steps = 0;
 
-
     return chain;
 }
 
@@ -967,18 +956,6 @@ struct icu_chain * icu_chain_xml_config(xmlNode *xml_node,
             step = icu_chain_insert_step(chain, ICU_chain_step_type_display, 
                                          (const uint8_t *) "", status);
         }
-#ifdef ICU_CHAIN_SORTKEY
-        else if (!strcmp((const char *) node->name,
-                         (const char *) "index")){
-            step = icu_chain_insert_step(chain, ICU_chain_step_type_index, 
-                                         (const uint8_t *) "", status);
-        }
-        else if (!strcmp((const char *) node->name,
-                         (const char *) "sortkey")){
-            step = icu_chain_insert_step(chain, ICU_chain_step_type_sortkey, 
-                                         (const uint8_t *) "", status);
-        }
-#endif
         xmlFree(xml_rule);
         if (!step || U_FAILURE(*status)){
             icu_chain_destroy(chain);
@@ -1019,14 +996,6 @@ struct icu_chain_step * icu_chain_insert_step(struct icu_chain * chain,
     case ICU_chain_step_type_display:
         buf16 = src16;
         break;
-#ifdef ICU_CHAIN_SORTKEY
-    case ICU_chain_step_type_index:
-        buf16 = src16;
-        break;
-    case ICU_chain_step_type_sortkey:
-        buf16 = src16;
-        break;
-#endif
     case ICU_chain_step_type_casemap:
         buf16 = icu_buf_utf16_create(0);
         break;
@@ -1095,19 +1064,6 @@ int icu_chain_step_next_token(struct icu_chain * chain,
     case ICU_chain_step_type_display:
         icu_utf16_to_utf8(chain->display8, src16, status);
         break;
-#ifdef ICU_CHAIN_SORTKEY
-        // TODO
-    case ICU_chain_step_type_index:
-        icu_utf16_to_utf8(chain->norm8, src16, status);
-        break;
-    case ICU_chain_step_type_sortkey:
-        icu_utf16_to_utf8(chain->sort8, src16, status);
-        //UErrorCode icu_sortkey8_from_utf16(UCollator *coll,
-        //                           struct icu_buf_utf8 * dest8, 
-        //                           struct icu_buf_utf16 * src16,
-        //                           UErrorCode * status);
-        break;
-#endif
     case ICU_chain_step_type_casemap:
         icu_casemap_casemap(step->u.casemap,
                             step->buf16, src16, status);
@@ -1135,8 +1091,6 @@ int icu_chain_step_next_token(struct icu_chain * chain,
         if (!step->more_tokens)
             step->more_tokens = icu_chain_step_next_token(chain, step, status);
 
-        //if (0 == step->more_tokens)
-        //return 0;
         break;
     default:
         return 0;
@@ -1157,104 +1111,6 @@ int icu_chain_step_next_token(struct icu_chain * chain,
 }
 
 
-#if 0 /* backup */
-int icu_chain_step_next_token_BAK(struct icu_chain * chain,
-                              struct icu_chain_step * step,
-                              UErrorCode *status)
-{
-    struct icu_buf_utf16 * src16 = 0;
-    
-    if (!chain || !chain->src16 || !step || !step->more_tokens)
-        return 0;
-
-    /* assign utf16 src buffers as neeed, advance in previous steps
-       tokens until non-zero token met, and setting stop condition
-    */
-    if (step->previous){
-        src16 = step->previous->buf16;
-        if (step->need_new_token)
-            step->more_tokens 
-                = icu_chain_step_next_token(chain, step->previous, status);
-    }
-    else { /* first step can only work once on chain->src16 input buffer */
-        src16 = chain->src16;
-        step->more_tokens = 1;
-    }
-
-    /* stop if nothing to process 
-       i.e new token source was not properly assigned
-       or I did not get any tokens from previous step
-   */
-    if (!step->more_tokens || !src16)
-        return 0;
-
-    /* perform the work, eventually put this steps output in 
-       step->buf16 or the chains UTF8 output buffers  */
-    switch(step->type) {
-    case ICU_chain_step_type_display:
-        icu_utf16_to_utf8(chain->display8, src16, status);
-        break;
-    case ICU_chain_step_type_index:
-        icu_utf16_to_utf8(chain->norm8, src16, status);
-        break;
-    case ICU_chain_step_type_sortkey:
-        icu_utf16_to_utf8(chain->sort8, src16, status);
-        break;
-    case ICU_chain_step_type_casemap:
-        icu_casemap_casemap(step->u.casemap,
-                            step->buf16, src16, status);
-        break;
-    case ICU_chain_step_type_normalize:
-        icu_normalizer_normalize(step->u.normalizer,
-                                 step->buf16, src16, status);
-        break;
-    case ICU_chain_step_type_tokenize:
-        /* attach to new src16 token only first time during splitting */
-        if (step->need_new_token){
-            icu_tokenizer_attach(step->u.tokenizer, src16, status);
-            step->need_new_token = 0;
-        }
-        /* splitting one src16 token into multiple buf16 tokens */
-        step->more_tokens
-            = icu_tokenizer_next_token(step->u.tokenizer,
-                                       step->buf16, status);
-        /* make sure to get new previous token if this one had been used up */
-        if (step->previous && !step->more_tokens){
-            if (icu_chain_step_next_token(chain, step->previous, status)){
-                icu_tokenizer_attach(step->u.tokenizer, src16, status);
-                step->need_new_token = 0;   
-                step->more_tokens
-                    = icu_tokenizer_next_token(step->u.tokenizer,
-                                               step->buf16, status);
-            }
-        }
-        if (0 == step->more_tokens)
-            return 0;
-        break;
-    default:
-        return 0;
-        break;
-    }
-
-    /* stop further token processing if last step and 
-       new tokens can ot be obtained from last non-existing step 
-    */
-    if (!step->previous)
-        step->more_tokens = 0;
-
-    if (U_FAILURE(*status))
-        return 0;
-
-    // result buf empty, got no token TODO: make while loop around all token
-    // fetching operations
-    //if (!step->buf16->utf16_len)
-    //    return 0;
-
-    return 1;
-}
-
-#endif /* backup */
-
 int icu_chain_assign_cstr(struct icu_chain * chain,
                           const char * src8cstr, 
                           UErrorCode *status)
@@ -1264,6 +1120,8 @@ int icu_chain_assign_cstr(struct icu_chain * chain,
     if (!chain || !src8cstr)
         return 0;
 
+    chain->src8cstr = src8cstr;
+
     stp = chain->steps;
     
     /* clear token count */
@@ -1276,8 +1134,9 @@ int icu_chain_assign_cstr(struct icu_chain * chain,
         stp = stp->previous;
     }
     
-    /* finally convert UTF8 to UTF16 string */
-    icu_utf16_from_utf8_cstr(chain->src16, src8cstr, status);
+    /* finally convert UTF8 to UTF16 string if needed */
+    if (chain->steps || chain->sort)
+        icu_utf16_from_utf8_cstr(chain->src16, chain->src8cstr, status);
             
     if (U_FAILURE(*status))
         return 0;
@@ -1292,27 +1151,47 @@ int icu_chain_next_token(struct icu_chain * chain,
 {
     int got_token = 0;
     
-    if (!chain || !chain->steps)
+    if (!chain)
         return 0;
 
-    while(!got_token && chain->steps->more_tokens)
-        got_token = icu_chain_step_next_token(chain, chain->steps, status);
-    
-    if (got_token){
-        chain->token_count++;
-
-        icu_utf16_to_utf8(chain->norm8, chain->steps->buf16, status);
+    /* special case with no steps - same as index type binary */
+    if (!chain->steps){
+        if (chain->token_count)
+            return 0;
+        else {
+            chain->token_count++;
+            
+            if (chain->sort)
+                icu_sortkey8_from_utf16(chain->coll,
+                                        chain->sort8, chain->steps->buf16,
+                                        status);
+            return chain->token_count;
+        }
+    }
+    /* usual case, one or more icu chain steps existing */
+    else {
 
-        icu_sortkey8_from_utf16(chain->coll,
-                                chain->sort8, chain->steps->buf16, status);
+        while(!got_token && chain->steps && chain->steps->more_tokens)
+            got_token = icu_chain_step_next_token(chain, chain->steps, status);
+    
+        if (got_token){
+            chain->token_count++;
 
-        return chain->token_count;
+            icu_utf16_to_utf8(chain->norm8, chain->steps->buf16, status);
+            
+            if (chain->sort)
+                icu_sortkey8_from_utf16(chain->coll,
+                                        chain->sort8, chain->steps->buf16,
+                                        status);
+            
+            return chain->token_count;
+        }
     }
-
+        
     return 0;
 }
 
-int icu_chain_get_token_count(struct icu_chain * chain)
+int icu_chain_token_number(struct icu_chain * chain)
 {
     if (!chain)
         return 0;
@@ -1321,8 +1200,7 @@ int icu_chain_get_token_count(struct icu_chain * chain)
 }
 
 
-
-const char * icu_chain_get_display(struct icu_chain * chain)
+const char * icu_chain_token_display(struct icu_chain * chain)
 {
     if (chain->display8)
         return icu_buf_utf8_to_cstr(chain->display8);
@@ -1330,15 +1208,18 @@ const char * icu_chain_get_display(struct icu_chain * chain)
     return 0;
 }
 
-const char * icu_chain_get_norm(struct icu_chain * chain)
+const char * icu_chain_token_norm(struct icu_chain * chain)
 {
+    if (!chain->steps)
+        return chain->src8cstr;
+
     if (chain->norm8)
         return icu_buf_utf8_to_cstr(chain->norm8);
     
     return 0;
 }
 
-const char * icu_chain_get_sort(struct icu_chain * chain)
+const char * icu_chain_token_sortkey(struct icu_chain * chain)
 {
     if (chain->sort8)
         return icu_buf_utf8_to_cstr(chain->sort8);