dovecot-2.2: fts: When indexing header names with lib-fts, add t...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/27ee6a472555
changeset: 19493:27ee6a472555
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Dec 08 15:47:28 2015 +0200
description:
fts: When indexing header names with lib-fts, add them using "data" language.

diffstat:

 src/plugins/fts/fts-build-mail.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 8f04a0ce1c76 -r 27ee6a472555 src/plugins/fts/fts-build-mail.c
--- a/src/plugins/fts/fts-build-mail.c	Tue Dec 08 13:28:01 2015 +0200
+++ b/src/plugins/fts/fts-build-mail.c	Tue Dec 08 15:47:28 2015 +0200
@@ -213,13 +213,18 @@
 
 	if ((ctx->update_ctx->backend->flags &
 	     FTS_BACKEND_FLAG_TOKENIZED_INPUT) != 0) {
-		/* index the header name itself */
+		/* index the header name itself using data-language. */
+		struct fts_user_language *prev_lang = ctx->cur_user_lang;
+
+		fts_mail_build_ctx_set_lang(ctx,
+			fts_user_get_data_lang(ctx->update_ctx->backend->ns->user));
 		key.hdr_name = "";
 		if (fts_backend_update_set_build_key(ctx->update_ctx, &key)) {
 			if (fts_build_data(ctx, (const void *)hdr->name,
 					   strlen(hdr->name), TRUE) < 0)
 				ret = -1;
 		}
+		fts_mail_build_ctx_set_lang(ctx, prev_lang);
 	}
 	return ret;
 }