dovecot-2.2: fts: Renamed filter and tokenizer specific setting ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/f5cebd75975f
changeset: 18598:f5cebd75975f
user:      Timo Sirainen <tss at iki.fi>
date:      Sat May 09 17:05:17 2015 +0300
description:
fts: Renamed filter and tokenizer specific setting keys.
Having the plural in the name didn't make a lot of sense, so all the
settings are now:

 fts_filters = name1 name2
 fts_filters_<lang> = name3 name 4
 fts_filter_<name> = key1=value1
 fts_filter_<lang>_<name> = key2=value2

 fts_tokenizers = name1 name2
 fts_tokenizer_<name> = key1=value1

So this also removes the confusion in settings if there existed a filter
with one of the language names.

diffstat:

 src/plugins/fts/fts-user.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r cfe29a5d66ed -r f5cebd75975f src/plugins/fts/fts-user.c
--- a/src/plugins/fts/fts-user.c	Sat May 09 17:00:12 2015 +0300
+++ b/src/plugins/fts/fts-user.c	Sat May 09 17:05:17 2015 +0300
@@ -118,11 +118,11 @@
 
 		/* try the language-specific setting first */
 		filter_set_name = t_str_replace(filters[i], '-', '_');
-		set_key = t_strdup_printf("fts_filters_%s_%s",
+		set_key = t_strdup_printf("fts_filter_%s_%s",
 					  lang->name, filter_set_name);
 		str = mail_user_plugin_getenv(user, set_key);
 		if (str == NULL) {
-			set_key = t_strdup_printf("fts_filters_%s", filter_set_name);
+			set_key = t_strdup_printf("fts_filter_%s", filter_set_name);
 			str = mail_user_plugin_getenv(user, set_key);
 		}
 
@@ -175,7 +175,7 @@
 		}
 
 		tokenizer_set_name = t_str_replace(tokenizers[i], '-', '_');
-		set_key = t_strdup_printf("fts_tokenizers_%s", tokenizer_set_name);
+		set_key = t_strdup_printf("fts_tokenizer_%s", tokenizer_set_name);
 		str = mail_user_plugin_getenv(user, set_key);
 
 		/* tell the tokenizers that we're tokenizing a search string