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

* lib: fix embedded text indexing

This commit is contained in:
djcb 2012-08-09 10:54:05 +03:00
parent 89b52d7eed
commit ea86b71294
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/mu-store-write.cc
View File

@ -219,18 +219,17 @@ flag_val (char flagchar)
{ {
static const std::string static const std::string
pfx (prefix(MU_MSG_FIELD_ID_FLAGS)), pfx (prefix(MU_MSG_FIELD_ID_FLAGS)),
draftstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_DRAFT))), draftstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_DRAFT))),
flaggedstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_FLAGGED))), flaggedstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_FLAGGED))),
passedstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_PASSED))), passedstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_PASSED))),
repliedstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_REPLIED))), repliedstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_REPLIED))),
seenstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_SEEN))), seenstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_SEEN))),
trashedstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_TRASHED))), trashedstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_TRASHED))),
newstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_NEW))), newstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_NEW))),
signedstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_SIGNED))),
signedstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_SIGNED))), cryptstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_ENCRYPTED))),
encryptedstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_ENCRYPTED))), attachstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_HAS_ATTACH))),
has_attachstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_HAS_ATTACH))), unreadstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_UNREAD)));
unreadstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_UNREAD)));
switch (flagchar) { switch (flagchar) {
@ -244,8 +243,8 @@ flag_val (char flagchar)
case 'N': return newstr; case 'N': return newstr;
case 'z': return signedstr; case 'z': return signedstr;
case 'x': return encryptedstr; case 'x': return cryptstr;
case 'a': return has_attachstr; case 'a': return attachstr;
case 'u': return unreadstr; case 'u': return unreadstr;
@ -265,17 +264,17 @@ prio_val (MuMsgPrio prio)
static const std::string pfx (prefix(MU_MSG_FIELD_ID_PRIO)); static const std::string pfx (prefix(MU_MSG_FIELD_ID_PRIO));
static const std::string static const std::string
lowstr (pfx + std::string(1, mu_msg_prio_char(MU_MSG_PRIO_LOW))), low (pfx + std::string(1, mu_msg_prio_char(MU_MSG_PRIO_LOW))),
normalstr (pfx + std::string(1, mu_msg_prio_char(MU_MSG_PRIO_NORMAL))), norm (pfx + std::string(1, mu_msg_prio_char(MU_MSG_PRIO_NORMAL))),
highstr (pfx + std::string(1, mu_msg_prio_char(MU_MSG_PRIO_HIGH))); high (pfx + std::string(1, mu_msg_prio_char(MU_MSG_PRIO_HIGH)));
switch (prio) { switch (prio) {
case MU_MSG_PRIO_LOW: return lowstr; case MU_MSG_PRIO_LOW: return low;
case MU_MSG_PRIO_NORMAL: return normalstr; case MU_MSG_PRIO_NORMAL: return norm;
case MU_MSG_PRIO_HIGH: return highstr; case MU_MSG_PRIO_HIGH: return high;
default: default:
g_return_val_if_reached (normalstr); g_return_val_if_reached (norm);
return normalstr; return norm;
} }
} }
@ -377,7 +376,8 @@ add_terms_values_string_list (Xapian::Document& doc, MuMsg *msg,
struct PartData { struct PartData {
PartData (Xapian::Document& doc, MuMsgFieldId mfid, GStringChunk *strchunk): PartData (Xapian::Document& doc, MuMsgFieldId mfid,
GStringChunk *strchunk):
_doc (doc), _mfid(mfid), _strchunk(strchunk) {} _doc (doc), _mfid(mfid), _strchunk(strchunk) {}
Xapian::Document _doc; Xapian::Document _doc;
MuMsgFieldId _mfid; MuMsgFieldId _mfid;
@ -392,13 +392,10 @@ maybe_index_text_part (MuMsg *msg, MuMsgPart *part, PartData *pdata)
char *txt, *norm; char *txt, *norm;
Xapian::TermGenerator termgen; Xapian::TermGenerator termgen;
/* only deal with attachments, inlines are indexed as body /* only deal with attachments/messages; inlines are indexed as
* parts */ * body parts */
if (!(part->part_type & MU_MSG_PART_TYPE_ATTACHMENT)) if (!(part->part_type & MU_MSG_PART_TYPE_ATTACHMENT) &&
return; !(part->part_type & MU_MSG_PART_TYPE_MESSAGE))
/* only text/plain */
if (!(part->part_type & MU_MSG_PART_TYPE_TEXT_PLAIN))
return; return;
txt = mu_msg_part_get_text (msg, part, MU_MSG_OPTION_NONE, txt = mu_msg_part_get_text (msg, part, MU_MSG_OPTION_NONE,
@ -435,7 +432,6 @@ each_part (MuMsg *msg, MuMsgPart *part, PartData *pdata)
char ctype[MuStore::MAX_TERM_LENGTH + 1]; char ctype[MuStore::MAX_TERM_LENGTH + 1];
snprintf (ctype, sizeof(ctype), "%s_%s", snprintf (ctype, sizeof(ctype), "%s_%s",
part->type, part->subtype); part->type, part->subtype);
// g_print ("store: %s\n", ctype);
pdata->_doc.add_term pdata->_doc.add_term
(mime + std::string(ctype, 0, MuStore::MAX_TERM_LENGTH)); (mime + std::string(ctype, 0, MuStore::MAX_TERM_LENGTH));
@ -597,7 +593,8 @@ each_contact_info (MuMsgContact *contact, MsgDoc *msgdoc)
Xapian::TermGenerator termgen; Xapian::TermGenerator termgen;
termgen.set_document (*msgdoc->_doc); termgen.set_document (*msgdoc->_doc);
/* note: norm is added to stringchunk, no need for freeing */ /* note: norm is added to stringchunk, no need for freeing */
char *norm = mu_str_normalize (contact->name, TRUE, msgdoc->_strchunk); char *norm = mu_str_normalize (contact->name, TRUE,
msgdoc->_strchunk);
termgen.index_text_without_positions (norm, 1, pfx); termgen.index_text_without_positions (norm, 1, pfx);
} }
@ -632,7 +629,6 @@ each_contact_check_if_personal (MuMsgContact *contact, MsgDoc *msgdoc)
return; return;
for (cur = msgdoc->_my_addresses; cur; cur = g_slist_next (cur)) { for (cur = msgdoc->_my_addresses; cur; cur = g_slist_next (cur)) {
//g_print ("%s <=> %s\n", contact->address, (const char*)cur->data);
if (g_ascii_strcasecmp (contact->address, if (g_ascii_strcasecmp (contact->address,
(const char*)cur->data) == 0) (const char*)cur->data) == 0)
msgdoc->_personal = TRUE; msgdoc->_personal = TRUE;