[dovecot-cvs] dovecot/src/plugins/fts-lucene fts-backend-lucene.c, 1.6, 1.7 lucene-wrapper.cc, 1.7, 1.8 lucene-wrapper.h, 1.4, 1.5

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/plugins/fts-lucene
In directory talvi:/tmp/cvs-serv21185/fts-lucene

Modified Files:
	fts-backend-lucene.c lucene-wrapper.cc lucene-wrapper.h 
Log Message:
Fixed filtering to work with Lucene. Generic FTS code now implements the
filtering if the backend doesn't.



Index: fts-backend-lucene.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/plugins/fts-lucene/fts-backend-lucene.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fts-backend-lucene.c	6 Dec 2006 15:45:15 -0000	1.6
+++ fts-backend-lucene.c	20 Dec 2006 14:46:28 -0000	1.7
@@ -177,17 +177,6 @@
 	return lucene_index_lookup(backend->lstorage->index, key, result);
 }
 
-static int
-fts_backend_lucene_filter(struct fts_backend *_backend, const char *key,
-			 ARRAY_TYPE(seq_range) *result)
-{
-	struct lucene_fts_backend *backend =
-		(struct lucene_fts_backend *)_backend;
-
-	fts_backend_select(backend);
-	return lucene_index_filter(backend->lstorage->index, key, result);
-}
-
 struct fts_backend fts_backend_lucene = {
 	"lucene",
 	TRUE,
@@ -204,6 +193,6 @@
 		fts_backend_lucene_lock,
 		fts_backend_lucene_unlock,
 		fts_backend_lucene_lookup,
-		fts_backend_lucene_filter
+		NULL
 	}
 };

Index: lucene-wrapper.cc
===================================================================
RCS file: /var/lib/cvs/dovecot/src/plugins/fts-lucene/lucene-wrapper.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- lucene-wrapper.cc	13 Dec 2006 13:45:39 -0000	1.7
+++ lucene-wrapper.cc	20 Dec 2006 14:46:28 -0000	1.8
@@ -475,10 +475,3 @@
 	_CLDELETE(content_query);
 	return ret;
 }
-
-int lucene_index_filter(struct lucene_index *index, const char *key,
-			ARRAY_TYPE(seq_range) *result)
-{
-	/* FIXME: implement */
-	return -1;
-}

Index: lucene-wrapper.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/plugins/fts-lucene/lucene-wrapper.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lucene-wrapper.h	25 Oct 2006 20:25:03 -0000	1.4
+++ lucene-wrapper.h	20 Dec 2006 14:46:28 -0000	1.5
@@ -19,7 +19,5 @@
 
 int lucene_index_lookup(struct lucene_index *index, const char *key,
 			ARRAY_TYPE(seq_range) *result);
-int lucene_index_filter(struct lucene_index *index, const char *key,
-			ARRAY_TYPE(seq_range) *result);
 
 #endif