dovecot-2.2: fts: If fts_filters setting doesn't exist, use buil...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/461bb302bd03
changeset: 18595:461bb302bd03
user:      Timo Sirainen <tss at iki.fi>
date:      Sat May 09 15:11:48 2015 +0300
description:
fts: If fts_filters setting doesn't exist, use built-in defaults.

diffstat:

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

diffs (33 lines):

diff -r b0ac652f9e2f -r 461bb302bd03 src/plugins/fts/fts-user.c
--- a/src/plugins/fts/fts-user.c	Sat May 09 15:10:17 2015 +0300
+++ b/src/plugins/fts/fts-user.c	Sat May 09 15:11:48 2015 +0300
@@ -11,6 +11,9 @@
 #define FTS_USER_CONTEXT(obj) \
 	MODULE_CONTEXT(obj, fts_user_module)
 
+#define FTS_DEFAULT_TOKENIZERS "generic email-address"
+#define FTS_DEFAULT_FILTERS "normalizer-icu snowball"
+
 struct fts_user {
 	union mail_user_module_context module_ctx;
 
@@ -72,8 +75,8 @@
 		filters_key = "fts_filters";
 		str = mail_user_plugin_getenv(user, filters_key);
 		if (str == NULL) {
-			*filter_r = NULL;
-			return 0;
+			str = FTS_DEFAULT_FILTERS;
+			filters_key = "fts_filters(built-in default)";
 		}
 	}
 
@@ -134,7 +137,7 @@
 	tokenizers_key = "fts_tokenizers";
 	str = mail_user_plugin_getenv(user, tokenizers_key);
 	if (str == NULL)
-		str = "generic email-address"; /* default tokenizers */
+		str = FTS_DEFAULT_TOKENIZERS;
 
 	tokenizers = t_strsplit_spaces(str, " ");