emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* mu-store-xapian: restore the behavior of storing both values and terms 

this will be removed again soon, but the query parser will need some changes
  before that works. see the note in the src
This commit is contained in:
Dirk-Jan C. Binnema 2010-01-23 14:12:45 +02:00
parent 366fe26fdb
commit 873f1a126a
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@
#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 /* not currently used */
#define MU_STORE_XAPIAN_MAX_TERM_LENGTH 240
struct _MuStoreXapian {
Xapian::WritableDatabase *_db;
@ -146,11 +146,18 @@ add_terms_values_number (Xapian::Document& doc, MuMsgGMime *msg,
gint64 num = mu_msg_gmime_get_field_numeric (msg, field);
const std::string numstr (Xapian::sortable_serialise((double)num));
doc.add_value ((Xapian::valueno)mu_msg_field_id(field), numstr);
doc.add_value ((Xapian::valueno)mu_msg_field_id(field), numstr);
doc.add_term (pfx + numstr);
}
/* FIXME: note that we store the same data as both a term and a value;
* we use the term for search and the value for getting the the data
* from the document; it's better to only use the value; however, this
* requires some changes in the query processing.
*/
static void
add_terms_values_string (Xapian::Document& doc, MuMsgGMime *msg,
const MuMsgField* field)
@ -168,7 +175,13 @@ add_terms_values_string (Xapian::Document& doc, MuMsgGMime *msg,
Xapian::TermGenerator termgen;
termgen.set_document (doc);
termgen.index_text_without_positions (str, 1, prefix);
}
} else {
/* 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),
value);
@ -274,7 +287,7 @@ mu_store_xapian_store (MuStoreXapian *store, MuMsgGMime *msg)
id = store->_db->replace_document (uid, newdoc);
++store->_processed;
commit_trx_if (store,
store->_processed % store->_trx_size == 0);
store->_processed % store->_trx_size == 0);
return MU_OK;