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

* mu-msg-fields: store escaped versions of maildirs, so matching works for 'strangely named' ones

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-01-11 23:18:55 +02:00
parent 9d630daf73
commit f2e8927f6f
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mu-msg-fields.c
View File

@ -113,7 +113,7 @@ static const MuMsgField FIELD_DATA[] = {
MU_MSG_FIELD_TYPE_STRING, MU_MSG_FIELD_TYPE_STRING,
"maildir", 'm', 'M', "maildir", 'm', 'M',
FLAG_GMIME | FLAG_XAPIAN_TERM | FLAG_XAPIAN_VALUE | FLAG_GMIME | FLAG_XAPIAN_TERM | FLAG_XAPIAN_VALUE |
FLAG_NORMALIZE FLAG_NORMALIZE | FLAG_XAPIAN_ESCAPE
}, },
{ {

7
src/mu-store.cc
View File

@ -251,8 +251,6 @@ rollback_trx_if (MuStore *store, gboolean cond)
} }
} }
void void
mu_store_flush (MuStore *store) mu_store_flush (MuStore *store)
{ {
@ -335,7 +333,7 @@ add_terms_values_string (Xapian::Document& doc, MuMsg *msg,
mu_str_normalize_in_place (val, TRUE); mu_str_normalize_in_place (val, TRUE);
if (mu_msg_field_xapian_escape (mfid)) if (mu_msg_field_xapian_escape (mfid))
mu_str_ascii_xapian_escape_in_place (val); mu_str_ascii_xapian_escape_in_place (val);
if (mu_msg_field_xapian_index (mfid)) { if (mu_msg_field_xapian_index (mfid)) {
Xapian::TermGenerator termgen; Xapian::TermGenerator termgen;
termgen.set_document (doc); termgen.set_document (doc);
@ -402,8 +400,7 @@ add_terms_values (MuMsgFieldId mfid, MsgDoc* msgdoc)
if (mu_msg_field_is_numeric (mfid)) if (mu_msg_field_is_numeric (mfid))
add_terms_values_number (*msgdoc->_doc, msgdoc->_msg, add_terms_values_number (*msgdoc->_doc, msgdoc->_msg,
mfid); mfid);
else if (mu_msg_field_type (mfid) == else if (mu_msg_field_type (mfid) == MU_MSG_FIELD_TYPE_STRING)
MU_MSG_FIELD_TYPE_STRING)
add_terms_values_string (*msgdoc->_doc, add_terms_values_string (*msgdoc->_doc,
msgdoc->_msg, msgdoc->_msg,
mfid); mfid);