alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-store-xapian: truncate overly long Xapian terms to so it doesn't throw

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2010-01-22 19:18:23 +02:00
parent 03ff32d9c8
commit 891f0ad3df
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/mu-store-xapian.cc
View File

@ -17,14 +17,13 @@
** **
*/ */
#include <xapian.h>
#include <string.h>
#include <stdio.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif /*HAVE_CONFIG_H*/ #endif /*HAVE_CONFIG_H*/
#include <cstdio>
#include <xapian.h>
#include "mu-msg.h" #include "mu-msg.h"
#include "mu-msg-gmime.h" #include "mu-msg-gmime.h"
#include "mu-store-xapian.h" #include "mu-store-xapian.h"
@ -33,6 +32,9 @@
/* number of new messages after which we commit to the database */ /* number of new messages after which we commit to the database */
#define MU_STORE_XAPIAN_TRX_SIZE 2000 #define MU_STORE_XAPIAN_TRX_SIZE 2000
/* http://article.gmane.org/gmane.comp.search.xapian.general/3656 */
#define MU_STORE_XAPIAN_MAX_TERM_LENGTH 240
struct _MuStoreXapian { struct _MuStoreXapian {
Xapian::WritableDatabase *_db; Xapian::WritableDatabase *_db;
@ -154,22 +156,27 @@ add_terms_values_string (Xapian::Document& doc, MuMsgGMime *msg,
const MuMsgField* field) const MuMsgField* field)
{ {
const char* str; const char* str;
str = mu_msg_gmime_get_field_string (msg, field); str = mu_msg_gmime_get_field_string (msg, field);
if (!str) if (!str)
return; return;
const std::string value (str); const std::string value (str);
const std::string prefix (mu_msg_field_xapian_prefix(field)); const std::string prefix (mu_msg_field_xapian_prefix(field));
if (mu_msg_field_is_xapian_indexable (field)) { if (mu_msg_field_is_xapian_indexable (field)) {
Xapian::TermGenerator termgen; Xapian::TermGenerator termgen;
termgen.set_document (doc); termgen.set_document (doc);
termgen.index_text_without_positions (value, 1, prefix); termgen.index_text_without_positions (str, 1, prefix);
} else } else {
doc.add_term(prefix + value); /* terms can be up to
* MU_STORE_XAPIAN_MAX_TERM_LENGTH (240) long; this is
* a Xapian limit */
doc.add_term (std::string (prefix + value, 0,
MU_STORE_XAPIAN_MAX_TERM_LENGTH));
}
doc.add_value ((Xapian::valueno)mu_msg_field_id(field), doc.add_value ((Xapian::valueno)mu_msg_field_id (field),
value); value);
} }
@ -370,8 +377,6 @@ mu_store_xapian_foreach (MuStoreXapian *self,
try { try {
Xapian::Enquire enq (*self->_db); Xapian::Enquire enq (*self->_db);
enq.set_query (Xapian::Query::MatchAll); enq.set_query (Xapian::Query::MatchAll);
enq.set_cutoff (0,0); enq.set_cutoff (0,0);