From 71d27db162533ab659e52be2803374af0f250ee6 Mon Sep 17 00:00:00 2001 From: Marco Bettini Date: Mon, 27 Nov 2023 08:53:03 +0000 Subject: [PATCH] fts-solr: Drop use_libfts parameter in fts_solr setting --- src/plugins/fts-solr/fts-backend-solr.c | 6 ------ src/plugins/fts-solr/fts-solr-plugin.c | 4 +--- src/plugins/fts-solr/fts-solr-plugin.h | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c index c06abce7f7..a2c7f2fdd2 100644 --- a/src/plugins/fts-solr/fts-backend-solr.c +++ b/src/plugins/fts-solr/fts-backend-solr.c @@ -186,12 +186,6 @@ fts_backend_solr_init(struct fts_backend *_backend, const char **error_r) *error_r = "Invalid fts_solr setting"; return -1; } - if (fuser->set.use_libfts) { - /* change our flags so we get proper input */ - _backend->flags &= ENUM_NEGATE(FTS_BACKEND_FLAG_FUZZY_SEARCH); - _backend->flags |= FTS_BACKEND_FLAG_TOKENIZED_INPUT; - } - return solr_connection_init(&fuser->set, _backend->event, &backend->solr_conn, error_r); } diff --git a/src/plugins/fts-solr/fts-solr-plugin.c b/src/plugins/fts-solr/fts-solr-plugin.c index 2a2c11cd4a..3040b5d921 100644 --- a/src/plugins/fts-solr/fts-solr-plugin.c +++ b/src/plugins/fts-solr/fts-solr-plugin.c @@ -34,8 +34,6 @@ fts_solr_plugin_init_settings(struct mail_user *user, set->url = p_strdup(user->pool, value); } else if (strcmp(*tmp, "debug") == 0) { set->debug = TRUE; - } else if (strcmp(*tmp, "use_libfts") == 0) { - set->use_libfts = TRUE; } else if (str_begins(*tmp, "rawlog_dir=", &value)) { set->rawlog_dir = p_strdup(user->pool, value); } else if (str_begins(*tmp, "batch_size=", &value)) { @@ -88,7 +86,7 @@ static void fts_solr_mail_user_create(struct mail_user *user, const char *env) /* invalid settings, disabling */ return; } - if (fts_mail_user_init(user, fuser->set.use_libfts, &error) < 0) { + if (fts_mail_user_init(user, FALSE, &error) < 0) { e_error(user->event, "fts-solr: %s", error); return; } diff --git a/src/plugins/fts-solr/fts-solr-plugin.h b/src/plugins/fts-solr/fts-solr-plugin.h index 8c63394401..dc116ee107 100644 --- a/src/plugins/fts-solr/fts-solr-plugin.h +++ b/src/plugins/fts-solr/fts-solr-plugin.h @@ -13,7 +13,6 @@ struct fts_solr_settings { const char *url, *rawlog_dir; unsigned int batch_size; - bool use_libfts; bool debug; bool soft_commit; }; -- 2.47.3