fts: If fts_filters setting doesn't exist, use built-in defaults.

diff --git a/src/plugins/fts/fts-user.c b/src/plugins/fts/fts-user.c
index 1f66a3fb6b867a2a5c9586e969fb802ea03d15bc..48861b1964741a0e9e8d7c16644f0b9cb5542ec3 100644 (file)
--- a/src/plugins/fts/fts-user.c
+++ b/src/plugins/fts/fts-user.c
@@ -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 @@ fts_user_create_filters(struct mail_user *user, const struct fts_language *lang,
                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 @@ fts_user_create_tokenizer(struct mail_user *user,
        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, " ");