changeset 13233:956b19efefc4

fts-lucene: Actually delete messages from index on expunge/rescan.
author Timo Sirainen <tss@iki.fi>
date Sun, 14 Aug 2011 20:55:12 +0300
parents 3680e4a0ca95
children 0ef83aa215d3
files src/plugins/fts-lucene/lucene-wrapper.cc
diffstat 1 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/fts-lucene/lucene-wrapper.cc	Sun Aug 14 20:41:44 2011 +0300
+++ b/src/plugins/fts-lucene/lucene-wrapper.cc	Sun Aug 14 20:55:12 2011 +0300
@@ -660,6 +660,8 @@
 				index->reader->deleteDocument(hits->id(i));
 		}
 		_CLDELETE(hits);
+		index->reader->close();
+		lucene_index_close(index);
 	} catch (CLuceneError &err) {
 		lucene_handle_error(index, err, "rescan search");
 		failed = true;
@@ -746,6 +748,15 @@
 			break;
 		}
 	}
+
+	try {
+		index->reader->close();
+		lucene_index_close(index);
+	} catch (CLuceneError &err) {
+		lucene_handle_error(index, err, "expunge delete");
+		ret = -1;
+	}
+
 	ret2 = fts_expunge_log_read_end(&ctx);
 	if (ret < 0 || ret2 < 0)
 		return -1;