X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ficu_transform.c;h=4e3036dba25d001e54442ad0055a767e40c86516;hp=10ace94405c1e52bbb8a68535b89f033159a666b;hb=f15418ee295542935d616a2163377b71e40ce04f;hpb=54bd147d353f7f340a48a9da5c6a568446223371

diff --git a/src/icu_transform.c b/src/icu_transform.c
index 10ace94..4e3036d 100644
--- a/src/icu_transform.c
+++ b/src/icu_transform.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
 
@@ -19,6 +19,7 @@
 
 #include <yaz/log.h>
 
+#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -32,6 +33,19 @@ struct icu_transform
     UTransliterator * trans;
 };
 
+struct icu_transform *icu_transform_clone(struct icu_transform *old)
+{
+    struct icu_transform *transform
+        = (struct icu_transform *) xmalloc(sizeof(struct icu_transform));
+    UErrorCode status = U_ZERO_ERROR;
+    assert(old);
+    transform->action = old->action;
+    assert(old->trans);
+    transform->trans = utrans_clone(old->trans, &status);
+    assert(transform->trans);
+    return transform;
+}
+
 struct icu_transform * icu_transform_create(const char *id, char action,
                                             const char *rules, 
                                             UErrorCode *status)
@@ -46,7 +60,10 @@ struct icu_transform * icu_transform_create(const char *id, char action,
     transform->trans = 0;
 
     if (id)
+    {
         icu_utf16_from_utf8_cstr(id16, id, status);
+        id16->utf16[id16->utf16_len] = 0;
+    }
     if (rules)
         icu_utf16_from_utf8_cstr(rules16, rules, status);
 
@@ -99,7 +116,7 @@ void icu_transform_destroy(struct icu_transform * transform)
 
 int icu_transform_trans(struct icu_transform * transform,
                         struct icu_buf_utf16 * dest16,
-                        struct icu_buf_utf16 * src16,
+                        const struct icu_buf_utf16 * src16,
                         UErrorCode *status)
 {
     if (!transform || !transform->trans 
@@ -118,7 +135,7 @@ int icu_transform_trans(struct icu_transform * transform,
     utrans_transUChars (transform->trans, 
                         dest16->utf16, &(dest16->utf16_len),
                         dest16->utf16_cap,
-                        0, &(src16->utf16_len), status);
+                        0, &(dest16->utf16_len), status);
 
     if (U_FAILURE(*status))
         icu_buf_utf16_clear(dest16);