From e138b0a737a30cd65758844507839a68a0b9aa52 Mon Sep 17 00:00:00 2001 From: Joan Moreau Date: Thu, 24 Jan 2019 19:53:12 +0100 Subject: [PATCH] Issue #12 --- README.md | 3 +++ src/fts-backend-xapian-functions.cpp | 2 +- src/fts-backend-xapian.cpp | 7 ++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5ee14e1..c67affa 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,9 @@ Prerequisites You are going to need the following things to get this going: * Dovecot above 2.3.x (untested with previous versions) +* Xapian 1.4.x (or above) +* ICU 63 or above + * Properly configured [Users Home Directories](https://wiki.dovecot.org/VirtualUsers/Home) in dovecot configuration diff --git a/src/fts-backend-xapian-functions.cpp b/src/fts-backend-xapian-functions.cpp index fa71c06..b85ea45 100644 --- a/src/fts-backend-xapian-functions.cpp +++ b/src/fts-backend-xapian-functions.cpp @@ -478,7 +478,7 @@ static void fts_backend_xapian_oldbox(struct xapian_fts_backend *backend) } /* End Performance calculator*/ - i_info("Done indexing '%s' (%d msgs in %d ms, rate: %.1f)",backend->oldbox,backend->perf_nb,dt,r); + i_info("Done indexing '%s' (%ld msgs in %ld ms, rate: %.1f)",backend->oldbox,backend->perf_nb,dt,r); i_free(backend->oldbox); backend->oldbox=NULL; } diff --git a/src/fts-backend-xapian.cpp b/src/fts-backend-xapian.cpp index a5a77b8..e4c36f2 100644 --- a/src/fts-backend-xapian.cpp +++ b/src/fts-backend-xapian.cpp @@ -1,6 +1,7 @@ /* Copyright (c) 2019 Joan Moreau , see the included COPYING file */ #include +#include extern "C" { #include "fts-xapian-plugin.h" } @@ -307,8 +308,8 @@ static void fts_backend_xapian_update_unset_build_key(struct fts_backend_update_ { struct xapian_fts_backend_update_context *ctx = (struct xapian_fts_backend_update_context *)_ctx; - struct xapian_fts_backend *backend = - (struct xapian_fts_backend *) ctx->ctx.backend; + //struct xapian_fts_backend *backend = + // (struct xapian_fts_backend *) ctx->ctx.backend; ctx->tbi_uid=0; } @@ -484,7 +485,7 @@ static int fts_backend_xapian_lookup(struct fts_backend *_backend, struct mailbo XResultSet * r=fts_backend_xapian_query(backend->dbr,&qs); long n=r->size; - i_info("Query: %d results",n); + //i_info("Query: %d results",n); i_array_init(&(result->definite_uids),r->size); i_array_init(&(result->maybe_uids),0);