Mercurial > dovecot > core-2.2

changeset 13108:a16971f5937b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-storage: Search query building no longer converts strings to decomposed titlecase.
author Timo Sirainen <tss@iki.fi>
date Tue, 26 Jul 2011 13:55:22 +0300
parents 254bcfcb64b1
children 2ab237202629
files src/lib-storage/mail-search-build.c src/lib-storage/mail-search-build.h src/lib-storage/mail-search-register-imap.c
diffstat 3 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/mail-search-build.c	Tue Jul 26 13:54:23 2011 +0300
+++ b/src/lib-storage/mail-search-build.c	Tue Jul 26 13:55:22 2011 +0300
@@ -153,7 +153,7 @@
 	ret = mail_search_build_list(&ctx, &root);
 	if (!ctx.charset_checked && ret == 0) {
 		/* make sure we give an error message if charset is invalid */
-		ret = mail_search_build_get_utf8_dtc(&ctx, "", &str);
+		ret = mail_search_build_get_utf8(&ctx, "", &str);
 	}
 	if (ret < 0) {
 		*error_r = ctx._error != NULL ? t_strdup(ctx._error) :
@@ -217,8 +217,8 @@
 	seq_range_array_add_range(&arg->value.seqset, seq1, seq2);
 }
 
-int mail_search_build_get_utf8_dtc(struct mail_search_build_context *ctx,
-				   const char *input, const char **output_r)
+int mail_search_build_get_utf8(struct mail_search_build_context *ctx,
+			       const char *input, const char **output_r)
 {
 	int ret;
 
@@ -226,8 +226,7 @@
 		string_t *utf8 = t_str_new(128);
 		enum charset_result result;
 
-		if (charset_to_utf8_str(ctx->charset,
-					CHARSET_FLAG_DECOMP_TITLECASE,
+		if (charset_to_utf8_str(ctx->charset, 0,
 					input, utf8, &result) < 0) {
 			/* unknown charset */
 			ctx->_error = "Unknown charset";
--- a/src/lib-storage/mail-search-build.h	Tue Jul 26 13:54:23 2011 +0300
+++ b/src/lib-storage/mail-search-build.h	Tue Jul 26 13:55:22 2011 +0300
@@ -39,10 +39,9 @@
 void mail_search_build_add_seqset(struct mail_search_args *args,
 				  uint32_t seq1, uint32_t seq2);
 
-/* Convert input string into UTF-8 decomposed titlecase, suitable for
-   message_search_init() */
-int mail_search_build_get_utf8_dtc(struct mail_search_build_context *ctx,
-				   const char *input, const char **output_r);
+/* Convert input string into UTF-8 */
+int mail_search_build_get_utf8(struct mail_search_build_context *ctx,
+			       const char *input, const char **output_r);
 
 struct mail_search_arg *
 mail_search_build_new(struct mail_search_build_context *ctx,
--- a/src/lib-storage/mail-search-register-imap.c	Tue Jul 26 13:54:23 2011 +0300
+++ b/src/lib-storage/mail-search-register-imap.c	Tue Jul 26 13:55:22 2011 +0300
@@ -232,7 +232,7 @@
 	if (mail_search_parse_string(ctx->parser, &value) < 0)
 		return NULL;
 
-	if (mail_search_build_get_utf8_dtc(ctx, value, &sarg->value.str) < 0)
+	if (mail_search_build_get_utf8(ctx, value, &sarg->value.str) < 0)
 		return NULL;
 
 	sarg->hdr_field_name = p_strdup(ctx->pool, hdr_name);
@@ -273,8 +273,8 @@
 	if (sarg == NULL)
 		return NULL;
 
-	if (mail_search_build_get_utf8_dtc(ctx, sarg->value.str,
-					   &sarg->value.str) < 0)
+	if (mail_search_build_get_utf8(ctx, sarg->value.str,
+				       &sarg->value.str) < 0)
 		return NULL;
 
 	if (mail_search_parse_skip_next(ctx->parser, "")) {