dovecot-2.2: fts: Remove default filters and tokenizers.
dovecot at dovecot.org
dovecot at dovecot.org
Fri Nov 20 10:51:53 UTC 2015
details: http://hg.dovecot.org/dovecot-2.2/rev/7b93d5d71f2e
changeset: 19404:7b93d5d71f2e
user: Teemu Huovila <teemu.huovila at dovecot.fi>
date: Wed Nov 18 16:33:26 2015 +0200
description:
fts: Remove default filters and tokenizers.
There aren't any specially good defaults that work for all the languages,
so it's better to just enforce explicit settings.
diffstat:
src/plugins/fts/fts-user.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diffs (38 lines):
diff -r 52e0fb4f2693 -r 7b93d5d71f2e src/plugins/fts/fts-user.c
--- a/src/plugins/fts/fts-user.c Thu Nov 19 17:43:47 2015 +0200
+++ b/src/plugins/fts/fts-user.c Wed Nov 18 16:33:26 2015 +0200
@@ -11,9 +11,6 @@
#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;
int refcount;
@@ -103,8 +100,9 @@
filters_key = "fts_filters";
str = mail_user_plugin_getenv(user, filters_key);
if (str == NULL) {
- str = FTS_DEFAULT_FILTERS;
- filters_key = "fts_filters(built-in default)";
+ /* No filters */
+ *filter_r = NULL;
+ return 0;
}
}
@@ -162,8 +160,10 @@
tokenizers_key = "fts_tokenizers";
str = mail_user_plugin_getenv(user, tokenizers_key);
- if (str == NULL)
- str = FTS_DEFAULT_TOKENIZERS;
+ if (str == NULL) {
+ *error_r = "fts_tokenizers setting is missing";
+ return -1;
+ }
tokenizers = t_strsplit_spaces(str, " ");
More information about the dovecot-cvs
mailing list