lib-fts: Added fts_icu_lcase()

diff --git a/src/lib-fts/fts-icu.c b/src/lib-fts/fts-icu.c
index e79d9b18cde168a871983fd08a76248a66a74b73..b3acb1fbb8f2627e2843b19111bdcd2b90c54cd6 100644 (file)
--- a/src/lib-fts/fts-icu.c
+++ b/src/lib-fts/fts-icu.c
@@ -5,8 +5,26 @@
 #include "unichar.h"
 #include "fts-icu.h"
 
+#include <unicode/uchar.h>
+#include <unicode/ucasemap.h>
 #include <unicode/uclean.h>
 
+static struct UCaseMap *icu_csm = NULL;
+
+static struct UCaseMap *fts_icu_csm(void)
+{
+       UErrorCode err = U_ZERO_ERROR;
+
+       if (icu_csm != NULL)
+               return icu_csm;
+       icu_csm = ucasemap_open(NULL, U_FOLD_CASE_DEFAULT, &err);
+       if (U_FAILURE(err)) {
+               i_fatal("LibICU ucasemap_open() failed: %s",
+                       u_errorName(err));
+       }
+       return icu_csm;
+}
+
 void fts_icu_utf8_to_utf16(buffer_t *dest_utf16, const char *src_utf8)
 {
        UErrorCode err = U_ZERO_ERROR;
@@ -111,7 +129,36 @@ int fts_icu_translate(buffer_t *dest_utf16, const UChar *src_utf16,
        return 0;
 }
 
+void fts_icu_lcase(string_t *dest_utf8, const char *src_utf8)
+{
+       struct UCaseMap *csm = fts_icu_csm();
+       size_t avail_bytes, dest_pos = dest_utf8->used;
+       char *dest_data;
+       int dest_full_len;
+       UErrorCode err = 0;
+
+       avail_bytes = buffer_get_writable_size(dest_utf8) - dest_pos;
+       dest_data = buffer_get_space_unsafe(dest_utf8, dest_pos, avail_bytes);
+
+       dest_full_len = ucasemap_utf8ToLower(csm, dest_data, avail_bytes,
+                                            src_utf8, -1, &err);
+       if (err == U_BUFFER_OVERFLOW_ERROR) {
+               err = U_ZERO_ERROR;
+               dest_data = buffer_get_space_unsafe(dest_utf8, dest_pos, dest_full_len);
+               dest_full_len = ucasemap_utf8ToLower(csm, dest_data, dest_full_len,
+                                                    src_utf8, -1, &err);
+               i_assert(err != U_BUFFER_OVERFLOW_ERROR);
+       }
+       if (U_FAILURE(err)) {
+               i_fatal("LibICU ucasemap_utf8ToLower() failed: %s",
+                       u_errorName(err));
+       }
+       buffer_set_used_size(dest_utf8, dest_full_len);
+}
+
 void fts_icu_deinit(void)
 {
+       if (icu_csm != NULL)
+               ucasemap_close(icu_csm);
        u_cleanup();
 }

diff --git a/src/lib-fts/fts-icu.h b/src/lib-fts/fts-icu.h
index bf867908e176628230d4c122463389305b5d5a93..5e5e285e35d1578c8890e92d912a6aa255480555 100644 (file)
--- a/src/lib-fts/fts-icu.h
+++ b/src/lib-fts/fts-icu.h
@@ -13,6 +13,8 @@ void fts_icu_utf16_to_utf8(string_t *dest_utf8, const UChar *src_utf16,
 int fts_icu_translate(buffer_t *dest_utf16, const UChar *src_utf16,
                      unsigned int src_len, UTransliterator *transliterator,
                      const char **error_r);
+/* Lowercase the given UTF-8 string. */
+void fts_icu_lcase(string_t *dest_utf8, const char *src_utf8);
 
 /* Free all the memory used by ICU functions. */
 void fts_icu_deinit(void);

diff --git a/src/lib-fts/test-fts-icu.c b/src/lib-fts/test-fts-icu.c
index 10944913c5425857205f84ae8e02af6c456caddb..563dd43258001292d2a4b75b6b7428132b633b88 100644 (file)
--- a/src/lib-fts/test-fts-icu.c
+++ b/src/lib-fts/test-fts-icu.c
@@ -141,6 +141,35 @@ static void test_fts_icu_translate_resize(void)
        test_end();
 }
 
+static void test_fts_icu_lcase(void)
+{
+       const char *src = "aBcD\xC3\x84\xC3\xA4";
+       string_t *dest = t_str_new(64);
+
+       test_begin("fts_icu_lcase");
+       fts_icu_lcase(dest, src);
+       test_assert(strcmp(str_c(dest), "abcd\xC3\xA4\xC3\xA4") == 0);
+       test_end();
+}
+
+static void test_fts_icu_lcase_resize(void)
+{
+       const char *src = "a\xC3\x84";
+       string_t *dest;
+       unsigned int i;
+
+       test_begin("fts_icu_lcase resize");
+       for (i = 2; i <= 4; i++) {
+               dest = t_str_new(i);
+               test_assert(buffer_get_size(dest) == i);
+               fts_icu_lcase(dest, src);
+               test_assert(strcmp(str_c(dest), "a\xC3\xA4") == 0);
+               test_assert(buffer_get_size(dest) == 4);
+       }
+
+       test_end();
+}
+
 int main(void)
 {
        static void (*test_functions[])(void) = {
@@ -150,9 +179,11 @@ int main(void)
                test_fts_icu_utf16_to_utf8_resize,
                test_fts_icu_translate,
                test_fts_icu_translate_resize,
+               test_fts_icu_lcase,
+               test_fts_icu_lcase_resize,
                NULL
        };
        int ret = test_run(test_functions);
-       u_cleanup();
+       fts_icu_deinit();
        return ret;
 }