Mercurial > dovecot > core-2.2

changeset 18591:e2a0b43e73ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-fts: Removed supports() function from filter API I think the original idea was that this could be used to automatically create filters for many languages, but this probably won't be needed or wanted.
author Timo Sirainen <tss@iki.fi>
date Sat, 09 May 2015 15:00:28 +0300
parents 12aeb1ac8f0d
children 00240870d0bd
files src/lib-fts/fts-filter-lowercase.c src/lib-fts/fts-filter-normalizer-icu.c src/lib-fts/fts-filter-private.h src/lib-fts/fts-filter-stemmer-snowball.c src/lib-fts/fts-filter-stopwords.c
diffstat 5 files changed, 1 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-fts/fts-filter-lowercase.c	Sat May 09 14:56:33 2015 +0300
+++ b/src/lib-fts/fts-filter-lowercase.c	Sat May 09 15:00:28 2015 +0300
@@ -6,12 +6,6 @@
 #include "fts-filter-private.h"
 #include "fts-language.h"
 
-static bool
-fts_filter_lowercase_supports(const struct fts_language *lang ATTR_UNUSED)
-{
-	return TRUE;
-}
-
 static void
 fts_filter_lowercase_destroy(struct fts_filter *filter)
 {
@@ -47,7 +41,6 @@
 }
 
 static const struct fts_filter_vfuncs normalizer_filter_vfuncs = {
-	fts_filter_lowercase_supports,
 	fts_filter_lowercase_create,
 	fts_filter_lowercase_filter,
 	fts_filter_lowercase_destroy
--- a/src/lib-fts/fts-filter-normalizer-icu.c	Sat May 09 14:56:33 2015 +0300
+++ b/src/lib-fts/fts-filter-normalizer-icu.c	Sat May 09 15:00:28 2015 +0300
@@ -114,13 +114,6 @@
 	*_dst = dst;
 }
 
-static bool fts_filter_normalizer_icu_supports(const struct fts_language *lang)
-{
-	if (lang == NULL || lang->name == NULL)
-		return FALSE;
-	return TRUE;
-}
-
 static void fts_filter_normalizer_icu_destroy(struct fts_filter *filter)
 {
 	struct fts_filter_normalizer *np =
@@ -242,19 +235,13 @@
 
 #else
 
-static bool
-fts_filter_normalizer_icu_supports(const struct fts_language *lang ATTR_UNUSED)
-{
-	return FALSE;
-}
-
 static int
 fts_filter_normalizer_icu_create(const struct fts_language *lang ATTR_UNUSED,
 				 const char *const *settings ATTR_UNUSED,
 				 struct fts_filter **filter_r ATTR_UNUSED,
 				 const char **error_r)
 {
-	*error_r = "libicu support not built in - can't use "ICU_NORMALIZER_FILTER_NAME;
+	*error_r = "libicu support not built in - can't use "ICU_NORMALIZER_FILTER_NAME;
 	return -1;
 }
 
@@ -274,7 +261,6 @@
 #endif
 
 static const struct fts_filter_vfuncs normalizer_filter_vfuncs = {
-	fts_filter_normalizer_icu_supports,
 	fts_filter_normalizer_icu_create,
 	fts_filter_normalizer_icu_filter,
 	fts_filter_normalizer_icu_destroy
--- a/src/lib-fts/fts-filter-private.h	Sat May 09 14:56:33 2015 +0300
+++ b/src/lib-fts/fts-filter-private.h	Sat May 09 15:00:28 2015 +0300
@@ -12,7 +12,6 @@
 
 */
 struct fts_filter_vfuncs {
-	bool (*supports)(const struct fts_language *lang);
 	int (*create)(const struct fts_language *lang,
 	              const char *const *settings,
 	              struct fts_filter **filter_r,
--- a/src/lib-fts/fts-filter-stemmer-snowball.c	Sat May 09 14:56:33 2015 +0300
+++ b/src/lib-fts/fts-filter-stemmer-snowball.c	Sat May 09 15:00:28 2015 +0300
@@ -16,17 +16,6 @@
 	struct sb_stemmer *stemmer;
 };
 
-static bool
-fts_filter_stemmer_snowball_supports(const struct fts_language *lang)
-{
-	struct sb_stemmer *stemmer = sb_stemmer_new(lang->name, NULL);
-	if (stemmer != NULL) {
-		sb_stemmer_delete(stemmer);
-		return TRUE;
-	}
-	return FALSE;
-}
-
 static void fts_filter_stemmer_snowball_destroy(struct fts_filter *filter)
 {
 	struct fts_filter_stemmer_snowball *sp =
@@ -105,11 +94,6 @@
 
 #else
 
-static bool
-fts_filter_stemmer_snowball_supports(const struct fts_language *lang ATTR_UNUSED)
-{
-	return FALSE;
-}
 static int
 fts_filter_stemmer_snowball_create(const struct fts_language *lang ATTR_UNUSED,
                                    const char *const *settings ATTR_UNUSED,
@@ -134,7 +118,6 @@
 
 #endif
 static const struct fts_filter_vfuncs snowball_stemmer_filter_vfuncs = {
-	fts_filter_stemmer_snowball_supports,
 	fts_filter_stemmer_snowball_create,
 	fts_filter_stemmer_snowball_filter,
 	fts_filter_stemmer_snowball_destroy
--- a/src/lib-fts/fts-filter-stopwords.c	Sat May 09 14:56:33 2015 +0300
+++ b/src/lib-fts/fts-filter-stopwords.c	Sat May 09 15:00:28 2015 +0300
@@ -23,15 +23,6 @@
 	const char *stopwords_dir;
 };
 
-/* TODO: Write this function or remove it from api. */
-static bool fts_filter_stopwords_supports(const struct fts_language *lang)
-{
-	/* TODO: former NULL check is for unit test _fail_create() */
-	if (lang == NULL || lang->name == NULL)
-		return FALSE;
-	return TRUE;
-}
-
 static int fts_filter_stopwords_read_list(struct fts_filter_stopwords *filter,
 					  const char **error_r)
 {
@@ -124,7 +115,6 @@
 }
 
 const struct fts_filter_vfuncs stopwords_filter_vfuncs = {
-	fts_filter_stopwords_supports,
 	fts_filter_stopwords_create,
 	fts_filter_stopwords_filter,
 	fts_filter_stopwords_destroy