Mercurial > dovecot > core-2.2

changeset 18550:cebe8be92034

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fts: Replace '-' with '_' in tokenizer-specific fts_tokenizers_* settings
author Teemu Huovila <teemu.huovila@dovecot.fi>
date Sat, 09 May 2015 11:03:21 +0300
parents ae0458c63761
children 7fe766887394
files src/plugins/fts/fts-user.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/fts/fts-user.c	Sat May 09 11:02:22 2015 +0300
+++ b/src/plugins/fts/fts-user.c	Sat May 09 11:03:21 2015 +0300
@@ -123,7 +123,7 @@
 {
 	const struct fts_tokenizer *tokenizer_class;
 	struct fts_tokenizer *tokenizer = NULL, *parent = NULL;
-	const char *tokenizers_key, *const *tokenizers;
+	const char *tokenizers_key, *const *tokenizers, *tokenizer_set_name;
 	const char *str, *error, *set_key, *const *settings;
 	unsigned int i;
 	int ret = 0;
@@ -144,7 +144,8 @@
 			break;
 		}
 
-		set_key = t_strdup_printf("fts_tokenizers_%s", tokenizers[i]);
+		tokenizer_set_name = t_str_replace(tokenizers[i], '-', '_');
+		set_key = t_strdup_printf("fts_tokenizers_%s", tokenizer_set_name);
 		str = mail_user_plugin_getenv(user, set_key);
 
 		/* If the email-address tokenizer is included in the search