fts-solr: Drop use_libfts parameter in fts_solr setting

diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
index c06abce7f768cd29da33e75138543801844c7355..a2c7f2fdd208dff187ce69f078291b0ee83295d1 100644 (file)
--- 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 2a2c11cd4abe09cf786ba1eceafb756b765db76e..3040b5d921230380a7246e8c07c1cd494cd51a92 100644 (file)
--- 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 8c6339440102cea54bfca33a39507c392a47bce0..dc116ee10747d7b566dd9df8736d193a3c5c7727 100644 (file)
--- 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;
 };