mirror of https://github.com/djcb/mu.git
mu-store: update whitespace
This commit is contained in:
Dirk-Jan C. Binnema
parent
26bd64f4c9
commit
34fae2c072
638
lib/mu-store.cc
638
lib/mu-store.cc
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
** Copyright (C) 2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
|
** Copyright (C) 2021 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
|
||||||
**
|
**
|
||||||
** This program is free software; you can redistribute it and/or modify it
|
** This program is free software; you can redistribute it and/or modify it
|
||||||
** under the terms of the GNU General Public License as published by the
|
** under the terms of the GNU General Public License as published by the
|
||||||
|
|
@ -64,42 +64,42 @@ constexpr auto ExpectedSchemaVersion = MU_STORE_SCHEMA_VERSION;
|
||||||
G_GNUC_CONST static const std::string&
|
G_GNUC_CONST static const std::string&
|
||||||
prefix (MuMsgFieldId mfid)
|
prefix (MuMsgFieldId mfid)
|
||||||
{
|
{
|
||||||
static std::string fields[MU_MSG_FIELD_ID_NUM];
|
static std::string fields[MU_MSG_FIELD_ID_NUM];
|
||||||
static bool initialized = false;
|
static bool initialized = false;
|
||||||
|
|
||||||
if (G_UNLIKELY(!initialized)) {
|
if (G_UNLIKELY(!initialized)) {
|
||||||
for (int i = 0; i != MU_MSG_FIELD_ID_NUM; ++i)
|
for (int i = 0; i != MU_MSG_FIELD_ID_NUM; ++i)
|
||||||
fields[i] = std::string (1, mu_msg_field_xapian_prefix
|
fields[i] = std::string (1, mu_msg_field_xapian_prefix
|
||||||
((MuMsgFieldId)i));
|
((MuMsgFieldId)i));
|
||||||
initialized = true;
|
initialized = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return fields[mfid];
|
return fields[mfid];
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
add_synonym_for_flag (MuFlags flag, Xapian::WritableDatabase *db)
|
add_synonym_for_flag (MuFlags flag, Xapian::WritableDatabase *db)
|
||||||
{
|
{
|
||||||
static const std::string pfx(prefix(MU_MSG_FIELD_ID_FLAGS));
|
static const std::string pfx(prefix(MU_MSG_FIELD_ID_FLAGS));
|
||||||
|
|
||||||
db->clear_synonyms (pfx + mu_flag_name (flag));
|
db->clear_synonyms (pfx + mu_flag_name (flag));
|
||||||
db->add_synonym (pfx + mu_flag_name (flag), pfx +
|
db->add_synonym (pfx + mu_flag_name (flag), pfx +
|
||||||
(std::string(1, (char)(tolower(mu_flag_char(flag))))));
|
(std::string(1, (char)(tolower(mu_flag_char(flag))))));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
add_synonym_for_prio (MuMsgPrio prio, Xapian::WritableDatabase *db)
|
add_synonym_for_prio (MuMsgPrio prio, Xapian::WritableDatabase *db)
|
||||||
{
|
{
|
||||||
static const std::string pfx (prefix(MU_MSG_FIELD_ID_PRIO));
|
static const std::string pfx (prefix(MU_MSG_FIELD_ID_PRIO));
|
||||||
|
|
||||||
std::string s1 (pfx + mu_msg_prio_name (prio));
|
std::string s1 (pfx + mu_msg_prio_name (prio));
|
||||||
std::string s2 (pfx + (std::string(1, mu_msg_prio_char (prio))));
|
std::string s2 (pfx + (std::string(1, mu_msg_prio_char (prio))));
|
||||||
|
|
||||||
db->clear_synonyms (s1);
|
db->clear_synonyms (s1);
|
||||||
db->clear_synonyms (s2);
|
db->clear_synonyms (s2);
|
||||||
|
|
||||||
db->add_synonym (s1, s2);
|
db->add_synonym (s1, s2);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct Store::Private {
|
struct Store::Private {
|
||||||
|
|
@ -401,8 +401,8 @@ Store::add_message (const std::string& path)
|
||||||
throw Error{Error::Code::Message, "failed to create message: %s",
|
throw Error{Error::Code::Message, "failed to create message: %s",
|
||||||
gerr ? gerr->message : "something went wrong"};
|
gerr ? gerr->message : "something went wrong"};
|
||||||
|
|
||||||
const auto docid{priv_->add_or_update_msg (0, msg, &gerr)};
|
const auto docid{priv_->add_or_update_msg (0, msg, &gerr)};
|
||||||
mu_msg_unref (msg);
|
mu_msg_unref (msg);
|
||||||
if (G_UNLIKELY(docid == InvalidId))
|
if (G_UNLIKELY(docid == InvalidId))
|
||||||
throw Error{Error::Code::Message, "failed to add message: %s",
|
throw Error{Error::Code::Message, "failed to add message: %s",
|
||||||
gerr ? gerr->message : "something went wrong"};
|
gerr ? gerr->message : "something went wrong"};
|
||||||
|
|
@ -410,14 +410,14 @@ Store::add_message (const std::string& path)
|
||||||
g_debug ("added message @ %s; docid = %u", path.c_str(), docid);
|
g_debug ("added message @ %s; docid = %u", path.c_str(), docid);
|
||||||
priv_->dirty();
|
priv_->dirty();
|
||||||
|
|
||||||
return docid;
|
return docid;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
Store::update_message (MuMsg *msg, unsigned docid)
|
Store::update_message (MuMsg *msg, unsigned docid)
|
||||||
{
|
{
|
||||||
GError *gerr{};
|
GError *gerr{};
|
||||||
const auto docid2{priv_->add_or_update_msg (docid, msg, &gerr)};
|
const auto docid2{priv_->add_or_update_msg (docid, msg, &gerr)};
|
||||||
|
|
||||||
if (G_UNLIKELY(docid != docid2))
|
if (G_UNLIKELY(docid != docid2))
|
||||||
throw Error{Error::Code::Internal, "failed to update message",
|
throw Error{Error::Code::Internal, "failed to update message",
|
||||||
|
|
@ -436,11 +436,11 @@ Store::remove_message (const std::string& path)
|
||||||
{
|
{
|
||||||
LOCKED;
|
LOCKED;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const std::string term{(get_uid_term(path.c_str()))};
|
const std::string term{(get_uid_term(path.c_str()))};
|
||||||
priv_->writable_db().delete_document(term);
|
priv_->writable_db().delete_document(term);
|
||||||
|
|
||||||
} MU_XAPIAN_CATCH_BLOCK_RETURN (false);
|
} MU_XAPIAN_CATCH_BLOCK_RETURN (false);
|
||||||
|
|
||||||
g_debug ("deleted message @ %s from store", path.c_str());
|
g_debug ("deleted message @ %s from store", path.c_str());
|
||||||
priv_->dirty();
|
priv_->dirty();
|
||||||
|
|
@ -454,7 +454,7 @@ Store::remove_messages (const std::vector<Store::Id>& ids)
|
||||||
{
|
{
|
||||||
LOCKED;
|
LOCKED;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
for (auto&& id: ids) {
|
for (auto&& id: ids) {
|
||||||
priv_->writable_db().delete_document(id);
|
priv_->writable_db().delete_document(id);
|
||||||
priv_->dirty();
|
priv_->dirty();
|
||||||
|
|
@ -493,8 +493,8 @@ Store::find_message (unsigned docid) const
|
||||||
{
|
{
|
||||||
LOCKED;
|
LOCKED;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Xapian::Document *doc{new Xapian::Document{priv_->db().get_document (docid)}};
|
Xapian::Document *doc{new Xapian::Document{priv_->db().get_document (docid)}};
|
||||||
GError *gerr{};
|
GError *gerr{};
|
||||||
auto msg{mu_msg_new_from_doc (reinterpret_cast<XapianDocument*>(doc), &gerr)};
|
auto msg{mu_msg_new_from_doc (reinterpret_cast<XapianDocument*>(doc), &gerr)};
|
||||||
if (!msg) {
|
if (!msg) {
|
||||||
|
|
@ -505,7 +505,7 @@ Store::find_message (unsigned docid) const
|
||||||
|
|
||||||
return msg;
|
return msg;
|
||||||
|
|
||||||
} MU_XAPIAN_CATCH_BLOCK_RETURN (nullptr);
|
} MU_XAPIAN_CATCH_BLOCK_RETURN (nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -514,11 +514,11 @@ Store::contains_message (const std::string& path) const
|
||||||
{
|
{
|
||||||
LOCKED;
|
LOCKED;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const std::string term (get_uid_term(path.c_str()));
|
const std::string term (get_uid_term(path.c_str()));
|
||||||
return priv_->db().term_exists (term);
|
return priv_->db().term_exists (term);
|
||||||
|
|
||||||
} MU_XAPIAN_CATCH_BLOCK_RETURN(false);
|
} MU_XAPIAN_CATCH_BLOCK_RETURN(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -529,19 +529,19 @@ Store::for_each_message_path (Store::ForEachMessageFunc func) const
|
||||||
|
|
||||||
size_t n{};
|
size_t n{};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Xapian::Enquire enq{priv_->db()};
|
Xapian::Enquire enq{priv_->db()};
|
||||||
|
|
||||||
enq.set_query (Xapian::Query::MatchAll);
|
enq.set_query (Xapian::Query::MatchAll);
|
||||||
enq.set_cutoff (0,0);
|
enq.set_cutoff (0,0);
|
||||||
|
|
||||||
Xapian::MSet matches(enq.get_mset (0, priv_->db().get_doccount()));
|
Xapian::MSet matches(enq.get_mset (0, priv_->db().get_doccount()));
|
||||||
|
|
||||||
for (auto&& it = matches.begin(); it != matches.end(); ++it, ++n)
|
for (auto&& it = matches.begin(); it != matches.end(); ++it, ++n)
|
||||||
if (!func (*it, it.get_document().get_value(MU_MSG_FIELD_ID_PATH)))
|
if (!func (*it, it.get_document().get_value(MU_MSG_FIELD_ID_PATH)))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
} MU_XAPIAN_CATCH_BLOCK;
|
} MU_XAPIAN_CATCH_BLOCK;
|
||||||
|
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
@ -571,7 +571,7 @@ Store::for_each_term (const std::string& field, Store::ForEachTermFunc func) con
|
||||||
|
|
||||||
size_t n{};
|
size_t n{};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const auto id = field_id (field.c_str());
|
const auto id = field_id (field.c_str());
|
||||||
if (id == MU_MSG_FIELD_ID_NONE)
|
if (id == MU_MSG_FIELD_ID_NONE)
|
||||||
return {};
|
return {};
|
||||||
|
|
@ -585,7 +585,7 @@ Store::for_each_term (const std::string& field, Store::ForEachTermFunc func) con
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
} MU_XAPIAN_CATCH_BLOCK;
|
} MU_XAPIAN_CATCH_BLOCK;
|
||||||
|
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
@ -601,92 +601,92 @@ Store::commit () try
|
||||||
static void
|
static void
|
||||||
add_terms_values_date (Xapian::Document& doc, MuMsg *msg, MuMsgFieldId mfid)
|
add_terms_values_date (Xapian::Document& doc, MuMsg *msg, MuMsgFieldId mfid)
|
||||||
{
|
{
|
||||||
const auto dstr = Mu::date_to_time_t_string (
|
const auto dstr = Mu::date_to_time_t_string (
|
||||||
(time_t)mu_msg_get_field_numeric (msg, mfid));
|
(time_t)mu_msg_get_field_numeric (msg, mfid));
|
||||||
|
|
||||||
doc.add_value ((Xapian::valueno)mfid, dstr);
|
doc.add_value ((Xapian::valueno)mfid, dstr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
add_terms_values_size (Xapian::Document& doc, MuMsg *msg, MuMsgFieldId mfid)
|
add_terms_values_size (Xapian::Document& doc, MuMsg *msg, MuMsgFieldId mfid)
|
||||||
{
|
{
|
||||||
const auto szstr =
|
const auto szstr =
|
||||||
Mu::size_to_string (mu_msg_get_field_numeric (msg, mfid));
|
Mu::size_to_string (mu_msg_get_field_numeric (msg, mfid));
|
||||||
doc.add_value ((Xapian::valueno)mfid, szstr);
|
doc.add_value ((Xapian::valueno)mfid, szstr);
|
||||||
}
|
}
|
||||||
|
|
||||||
G_GNUC_CONST
|
G_GNUC_CONST
|
||||||
static const std::string&
|
static const std::string&
|
||||||
flag_val (char flagchar)
|
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))),
|
cryptstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_ENCRYPTED))),
|
||||||
attachstr (pfx + (char)tolower(mu_flag_char(MU_FLAG_HAS_ATTACH))),
|
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))),
|
||||||
liststr (pfx + (char)tolower(mu_flag_char(MU_FLAG_LIST)));
|
liststr (pfx + (char)tolower(mu_flag_char(MU_FLAG_LIST)));
|
||||||
|
|
||||||
switch (flagchar) {
|
switch (flagchar) {
|
||||||
|
|
||||||
case 'D': return draftstr;
|
case 'D': return draftstr;
|
||||||
case 'F': return flaggedstr;
|
case 'F': return flaggedstr;
|
||||||
case 'P': return passedstr;
|
case 'P': return passedstr;
|
||||||
case 'R': return repliedstr;
|
case 'R': return repliedstr;
|
||||||
case 'S': return seenstr;
|
case 'S': return seenstr;
|
||||||
case 'T': return trashedstr;
|
case 'T': return trashedstr;
|
||||||
|
|
||||||
case 'N': return newstr;
|
case 'N': return newstr;
|
||||||
|
|
||||||
case 'z': return signedstr;
|
case 'z': return signedstr;
|
||||||
case 'x': return cryptstr;
|
case 'x': return cryptstr;
|
||||||
case 'a': return attachstr;
|
case 'a': return attachstr;
|
||||||
case 'l': return liststr;
|
case 'l': return liststr;
|
||||||
|
|
||||||
case 'u': return unreadstr;
|
case 'u': return unreadstr;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
g_return_val_if_reached (flaggedstr);
|
g_return_val_if_reached (flaggedstr);
|
||||||
return flaggedstr;
|
return flaggedstr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* pre-calculate; optimization */
|
/* pre-calculate; optimization */
|
||||||
G_GNUC_CONST static const std::string&
|
G_GNUC_CONST static const std::string&
|
||||||
prio_val (MuMsgPrio prio)
|
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
|
||||||
low (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))),
|
||||||
norm (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))),
|
||||||
high (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 low;
|
case MU_MSG_PRIO_LOW: return low;
|
||||||
case MU_MSG_PRIO_NORMAL: return norm;
|
case MU_MSG_PRIO_NORMAL: return norm;
|
||||||
case MU_MSG_PRIO_HIGH: return high;
|
case MU_MSG_PRIO_HIGH: return high;
|
||||||
default:
|
default:
|
||||||
g_return_val_if_reached (norm);
|
g_return_val_if_reached (norm);
|
||||||
return norm;
|
return norm;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void // add term, truncate if needed.
|
static void // add term, truncate if needed.
|
||||||
add_term (Xapian::Document& doc, const std::string& term)
|
add_term (Xapian::Document& doc, const std::string& term)
|
||||||
{
|
{
|
||||||
if (term.length() < Store::MaxTermLength)
|
if (term.length() < Store::MaxTermLength)
|
||||||
doc.add_term(term);
|
doc.add_term(term);
|
||||||
else
|
else
|
||||||
doc.add_term(term.substr(0, Store::MaxTermLength));
|
doc.add_term(term.substr(0, Store::MaxTermLength));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -694,22 +694,22 @@ add_term (Xapian::Document& doc, const std::string& term)
|
||||||
static void
|
static void
|
||||||
add_terms_values_number (Xapian::Document& doc, MuMsg *msg, MuMsgFieldId mfid)
|
add_terms_values_number (Xapian::Document& doc, MuMsg *msg, MuMsgFieldId mfid)
|
||||||
{
|
{
|
||||||
gint64 num = mu_msg_get_field_numeric (msg, mfid);
|
gint64 num = mu_msg_get_field_numeric (msg, mfid);
|
||||||
|
|
||||||
const std::string numstr (Xapian::sortable_serialise((double)num));
|
const std::string numstr (Xapian::sortable_serialise((double)num));
|
||||||
doc.add_value ((Xapian::valueno)mfid, numstr);
|
doc.add_value ((Xapian::valueno)mfid, numstr);
|
||||||
|
|
||||||
if (mfid == MU_MSG_FIELD_ID_FLAGS) {
|
if (mfid == MU_MSG_FIELD_ID_FLAGS) {
|
||||||
const char *cur = mu_flags_to_str_s
|
const char *cur = mu_flags_to_str_s
|
||||||
((MuFlags)num,(MuFlagType)MU_FLAG_TYPE_ANY);
|
((MuFlags)num,(MuFlagType)MU_FLAG_TYPE_ANY);
|
||||||
g_return_if_fail (cur);
|
g_return_if_fail (cur);
|
||||||
while (*cur) {
|
while (*cur) {
|
||||||
add_term (doc, flag_val(*cur));
|
add_term (doc, flag_val(*cur));
|
||||||
++cur;
|
++cur;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (mfid == MU_MSG_FIELD_ID_PRIO)
|
} else if (mfid == MU_MSG_FIELD_ID_PRIO)
|
||||||
add_term (doc, prio_val((MuMsgPrio)num));
|
add_term (doc, prio_val((MuMsgPrio)num));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -717,296 +717,296 @@ add_terms_values_number (Xapian::Document& doc, MuMsg *msg, MuMsgFieldId mfid)
|
||||||
static void
|
static void
|
||||||
add_terms_values_str (Xapian::Document& doc, const char *val, MuMsgFieldId mfid)
|
add_terms_values_str (Xapian::Document& doc, const char *val, MuMsgFieldId mfid)
|
||||||
{
|
{
|
||||||
const auto flat = Mu::utf8_flatten (val);
|
const auto flat = Mu::utf8_flatten (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);
|
||||||
termgen.index_text (flat, 1, prefix(mfid));
|
termgen.index_text (flat, 1, prefix(mfid));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mu_msg_field_xapian_term(mfid))
|
if (mu_msg_field_xapian_term(mfid))
|
||||||
add_term(doc, prefix(mfid) + flat);
|
add_term(doc, prefix(mfid) + flat);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
add_terms_values_string (Xapian::Document& doc, MuMsg *msg, MuMsgFieldId mfid)
|
add_terms_values_string (Xapian::Document& doc, MuMsg *msg, MuMsgFieldId mfid)
|
||||||
{
|
{
|
||||||
const char *orig;
|
const char *orig;
|
||||||
|
|
||||||
if (!(orig = mu_msg_get_field_string (msg, mfid)))
|
if (!(orig = mu_msg_get_field_string (msg, mfid)))
|
||||||
return; /* nothing to do */
|
return; /* nothing to do */
|
||||||
|
|
||||||
/* the value is what we display in search results; the
|
/* the value is what we display in search results; the
|
||||||
* unchanged original */
|
* unchanged original */
|
||||||
if (mu_msg_field_xapian_value(mfid))
|
if (mu_msg_field_xapian_value(mfid))
|
||||||
doc.add_value ((Xapian::valueno)mfid, orig);
|
doc.add_value ((Xapian::valueno)mfid, orig);
|
||||||
|
|
||||||
add_terms_values_str (doc, orig, mfid);
|
add_terms_values_str (doc, orig, mfid);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
add_terms_values_string_list (Xapian::Document& doc, MuMsg *msg,
|
add_terms_values_string_list (Xapian::Document& doc, MuMsg *msg,
|
||||||
MuMsgFieldId mfid)
|
MuMsgFieldId mfid)
|
||||||
{
|
{
|
||||||
const GSList *lst;
|
const GSList *lst;
|
||||||
|
|
||||||
lst = mu_msg_get_field_string_list (msg, mfid);
|
lst = mu_msg_get_field_string_list (msg, mfid);
|
||||||
if (!lst)
|
if (!lst)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (mu_msg_field_xapian_value (mfid)) {
|
if (mu_msg_field_xapian_value (mfid)) {
|
||||||
gchar *str;
|
gchar *str;
|
||||||
str = mu_str_from_list (lst, ',');
|
str = mu_str_from_list (lst, ',');
|
||||||
if (str)
|
if (str)
|
||||||
doc.add_value ((Xapian::valueno)mfid, str);
|
doc.add_value ((Xapian::valueno)mfid, str);
|
||||||
g_free (str);
|
g_free (str);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mu_msg_field_xapian_term (mfid)) {
|
if (mu_msg_field_xapian_term (mfid)) {
|
||||||
for (; lst; lst = g_slist_next ((GSList*)lst))
|
for (; lst; lst = g_slist_next ((GSList*)lst))
|
||||||
add_terms_values_str (doc, (const gchar*)lst->data,
|
add_terms_values_str (doc, (const gchar*)lst->data,
|
||||||
mfid);
|
mfid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
struct PartData {
|
struct PartData {
|
||||||
PartData (Xapian::Document& doc, MuMsgFieldId mfid):
|
PartData (Xapian::Document& doc, MuMsgFieldId mfid):
|
||||||
_doc (doc), _mfid(mfid) {}
|
_doc (doc), _mfid(mfid) {}
|
||||||
Xapian::Document _doc;
|
Xapian::Document _doc;
|
||||||
MuMsgFieldId _mfid;
|
MuMsgFieldId _mfid;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* index non-body text parts */
|
/* index non-body text parts */
|
||||||
static void
|
static void
|
||||||
maybe_index_text_part (MuMsg *msg, MuMsgPart *part, PartData *pdata)
|
maybe_index_text_part (MuMsg *msg, MuMsgPart *part, PartData *pdata)
|
||||||
{
|
{
|
||||||
char *txt;
|
char *txt;
|
||||||
Xapian::TermGenerator termgen;
|
Xapian::TermGenerator termgen;
|
||||||
|
|
||||||
/* only deal with attachments/messages; inlines are indexed as
|
/* only deal with attachments/messages; inlines are indexed as
|
||||||
* body parts */
|
* body parts */
|
||||||
if (!(part->part_type & MU_MSG_PART_TYPE_ATTACHMENT) &&
|
if (!(part->part_type & MU_MSG_PART_TYPE_ATTACHMENT) &&
|
||||||
!(part->part_type & MU_MSG_PART_TYPE_MESSAGE))
|
!(part->part_type & MU_MSG_PART_TYPE_MESSAGE))
|
||||||
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);
|
||||||
if (!txt)
|
if (!txt)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
termgen.set_document(pdata->_doc);
|
termgen.set_document(pdata->_doc);
|
||||||
const auto str = Mu::utf8_flatten (txt);
|
const auto str = Mu::utf8_flatten (txt);
|
||||||
g_free (txt);
|
g_free (txt);
|
||||||
|
|
||||||
termgen.index_text (str, 1, prefix(MU_MSG_FIELD_ID_EMBEDDED_TEXT));
|
termgen.index_text (str, 1, prefix(MU_MSG_FIELD_ID_EMBEDDED_TEXT));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
each_part (MuMsg *msg, MuMsgPart *part, PartData *pdata)
|
each_part (MuMsg *msg, MuMsgPart *part, PartData *pdata)
|
||||||
{
|
{
|
||||||
char *fname;
|
char *fname;
|
||||||
static const std::string
|
static const std::string
|
||||||
file (prefix(MU_MSG_FIELD_ID_FILE)),
|
file (prefix(MU_MSG_FIELD_ID_FILE)),
|
||||||
mime (prefix(MU_MSG_FIELD_ID_MIME));
|
mime (prefix(MU_MSG_FIELD_ID_MIME));
|
||||||
|
|
||||||
/* save the mime type of any part */
|
/* save the mime type of any part */
|
||||||
if (part->type) {
|
if (part->type) {
|
||||||
char ctype[Store::MaxTermLength + 1];
|
char ctype[Store::MaxTermLength + 1];
|
||||||
g_snprintf(ctype, sizeof(ctype), "%s/%s", part->type, part->subtype);
|
g_snprintf(ctype, sizeof(ctype), "%s/%s", part->type, part->subtype);
|
||||||
add_term(pdata->_doc, mime + ctype);
|
add_term(pdata->_doc, mime + ctype);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((fname = mu_msg_part_get_filename (part, FALSE))) {
|
if ((fname = mu_msg_part_get_filename (part, FALSE))) {
|
||||||
const auto flat = Mu::utf8_flatten (fname);
|
const auto flat = Mu::utf8_flatten (fname);
|
||||||
g_free (fname);
|
g_free (fname);
|
||||||
add_term(pdata->_doc, file + flat);
|
add_term(pdata->_doc, file + flat);
|
||||||
}
|
}
|
||||||
|
|
||||||
maybe_index_text_part (msg, part, pdata);
|
maybe_index_text_part (msg, part, pdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
add_terms_values_attach (Xapian::Document& doc, MuMsg *msg,
|
add_terms_values_attach (Xapian::Document& doc, MuMsg *msg,
|
||||||
MuMsgFieldId mfid)
|
MuMsgFieldId mfid)
|
||||||
{
|
{
|
||||||
PartData pdata (doc, mfid);
|
PartData pdata (doc, mfid);
|
||||||
mu_msg_part_foreach (msg, MU_MSG_OPTION_RECURSE_RFC822,
|
mu_msg_part_foreach (msg, MU_MSG_OPTION_RECURSE_RFC822,
|
||||||
(MuMsgPartForeachFunc)each_part, &pdata);
|
(MuMsgPartForeachFunc)each_part, &pdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
add_terms_values_body (Xapian::Document& doc, MuMsg *msg,
|
add_terms_values_body (Xapian::Document& doc, MuMsg *msg,
|
||||||
MuMsgFieldId mfid)
|
MuMsgFieldId mfid)
|
||||||
{
|
{
|
||||||
if (mu_msg_get_flags(msg) & MU_FLAG_ENCRYPTED)
|
if (mu_msg_get_flags(msg) & MU_FLAG_ENCRYPTED)
|
||||||
return; /* ignore encrypted bodies */
|
return; /* ignore encrypted bodies */
|
||||||
|
|
||||||
auto str = mu_msg_get_body_text (msg, MU_MSG_OPTION_NONE);
|
auto str = mu_msg_get_body_text (msg, MU_MSG_OPTION_NONE);
|
||||||
if (!str) /* FIXME: html->txt fallback needed */
|
if (!str) /* FIXME: html->txt fallback needed */
|
||||||
str = mu_msg_get_body_html (msg, MU_MSG_OPTION_NONE);
|
str = mu_msg_get_body_html (msg, MU_MSG_OPTION_NONE);
|
||||||
if (!str)
|
if (!str)
|
||||||
return; /* no body... */
|
return; /* no body... */
|
||||||
|
|
||||||
Xapian::TermGenerator termgen;
|
Xapian::TermGenerator termgen;
|
||||||
termgen.set_document(doc);
|
termgen.set_document(doc);
|
||||||
|
|
||||||
const auto flat = Mu::utf8_flatten(str);
|
const auto flat = Mu::utf8_flatten(str);
|
||||||
termgen.index_text (flat, 1, prefix(mfid));
|
termgen.index_text (flat, 1, prefix(mfid));
|
||||||
}
|
}
|
||||||
|
|
||||||
struct MsgDoc {
|
struct MsgDoc {
|
||||||
Xapian::Document *_doc;
|
Xapian::Document *_doc;
|
||||||
MuMsg *_msg;
|
MuMsg *_msg;
|
||||||
Store::Private *_priv;
|
Store::Private *_priv;
|
||||||
/* callback data, to determine whether this message is 'personal' */
|
/* callback data, to determine whether this message is 'personal' */
|
||||||
gboolean _personal;
|
gboolean _personal;
|
||||||
const StringVec *_my_addresses;
|
const StringVec *_my_addresses;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
add_terms_values_default (MuMsgFieldId mfid, MsgDoc *msgdoc)
|
add_terms_values_default (MuMsgFieldId mfid, MsgDoc *msgdoc)
|
||||||
{
|
{
|
||||||
if (mu_msg_field_is_numeric (mfid))
|
if (mu_msg_field_is_numeric (mfid))
|
||||||
add_terms_values_number
|
add_terms_values_number
|
||||||
(*msgdoc->_doc, msgdoc->_msg, mfid);
|
(*msgdoc->_doc, msgdoc->_msg, mfid);
|
||||||
else if (mu_msg_field_is_string (mfid))
|
else if (mu_msg_field_is_string (mfid))
|
||||||
add_terms_values_string
|
add_terms_values_string
|
||||||
(*msgdoc->_doc, msgdoc->_msg, mfid);
|
(*msgdoc->_doc, msgdoc->_msg, mfid);
|
||||||
else if (mu_msg_field_is_string_list(mfid))
|
else if (mu_msg_field_is_string_list(mfid))
|
||||||
add_terms_values_string_list
|
add_terms_values_string_list
|
||||||
(*msgdoc->_doc, msgdoc->_msg, mfid);
|
(*msgdoc->_doc, msgdoc->_msg, mfid);
|
||||||
else
|
else
|
||||||
g_return_if_reached ();
|
g_return_if_reached ();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
add_terms_values (MuMsgFieldId mfid, MsgDoc* msgdoc)
|
add_terms_values (MuMsgFieldId mfid, MsgDoc* msgdoc)
|
||||||
{
|
{
|
||||||
/* note: contact-stuff (To/Cc/From) will handled in
|
/* note: contact-stuff (To/Cc/From) will handled in
|
||||||
* each_contact_info, not here */
|
* each_contact_info, not here */
|
||||||
if (!mu_msg_field_xapian_index(mfid) &&
|
if (!mu_msg_field_xapian_index(mfid) &&
|
||||||
!mu_msg_field_xapian_term(mfid) &&
|
!mu_msg_field_xapian_term(mfid) &&
|
||||||
!mu_msg_field_xapian_value(mfid))
|
!mu_msg_field_xapian_value(mfid))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
switch (mfid) {
|
switch (mfid) {
|
||||||
case MU_MSG_FIELD_ID_DATE:
|
case MU_MSG_FIELD_ID_DATE:
|
||||||
add_terms_values_date (*msgdoc->_doc, msgdoc->_msg, mfid);
|
add_terms_values_date (*msgdoc->_doc, msgdoc->_msg, mfid);
|
||||||
break;
|
break;
|
||||||
case MU_MSG_FIELD_ID_SIZE:
|
case MU_MSG_FIELD_ID_SIZE:
|
||||||
add_terms_values_size (*msgdoc->_doc, msgdoc->_msg, mfid);
|
add_terms_values_size (*msgdoc->_doc, msgdoc->_msg, mfid);
|
||||||
break;
|
break;
|
||||||
case MU_MSG_FIELD_ID_BODY_TEXT:
|
case MU_MSG_FIELD_ID_BODY_TEXT:
|
||||||
add_terms_values_body (*msgdoc->_doc, msgdoc->_msg, mfid);
|
add_terms_values_body (*msgdoc->_doc, msgdoc->_msg, mfid);
|
||||||
break;
|
break;
|
||||||
/* note: add_terms_values_attach handles _FILE, _MIME and
|
/* note: add_terms_values_attach handles _FILE, _MIME and
|
||||||
* _ATTACH_TEXT msgfields */
|
* _ATTACH_TEXT msgfields */
|
||||||
case MU_MSG_FIELD_ID_FILE:
|
case MU_MSG_FIELD_ID_FILE:
|
||||||
add_terms_values_attach (*msgdoc->_doc, msgdoc->_msg, mfid);
|
add_terms_values_attach (*msgdoc->_doc, msgdoc->_msg, mfid);
|
||||||
break;
|
break;
|
||||||
case MU_MSG_FIELD_ID_MIME:
|
case MU_MSG_FIELD_ID_MIME:
|
||||||
case MU_MSG_FIELD_ID_EMBEDDED_TEXT:
|
case MU_MSG_FIELD_ID_EMBEDDED_TEXT:
|
||||||
break;
|
break;
|
||||||
case MU_MSG_FIELD_ID_THREAD_ID:
|
case MU_MSG_FIELD_ID_THREAD_ID:
|
||||||
case MU_MSG_FIELD_ID_UID:
|
case MU_MSG_FIELD_ID_UID:
|
||||||
break; /* already taken care of elsewhere */
|
break; /* already taken care of elsewhere */
|
||||||
default:
|
default:
|
||||||
return add_terms_values_default (mfid, msgdoc);
|
return add_terms_values_default (mfid, msgdoc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static const std::string&
|
static const std::string&
|
||||||
xapian_pfx (MuMsgContact *contact)
|
xapian_pfx (MuMsgContact *contact)
|
||||||
{
|
{
|
||||||
static const std::string empty;
|
static const std::string empty;
|
||||||
|
|
||||||
/* use ptr to string to prevent copy... */
|
/* use ptr to string to prevent copy... */
|
||||||
switch (contact->type) {
|
switch (contact->type) {
|
||||||
case MU_MSG_CONTACT_TYPE_TO:
|
case MU_MSG_CONTACT_TYPE_TO:
|
||||||
return prefix(MU_MSG_FIELD_ID_TO);
|
return prefix(MU_MSG_FIELD_ID_TO);
|
||||||
case MU_MSG_CONTACT_TYPE_FROM:
|
case MU_MSG_CONTACT_TYPE_FROM:
|
||||||
return prefix(MU_MSG_FIELD_ID_FROM);
|
return prefix(MU_MSG_FIELD_ID_FROM);
|
||||||
case MU_MSG_CONTACT_TYPE_CC:
|
case MU_MSG_CONTACT_TYPE_CC:
|
||||||
return prefix(MU_MSG_FIELD_ID_CC);
|
return prefix(MU_MSG_FIELD_ID_CC);
|
||||||
case MU_MSG_CONTACT_TYPE_BCC:
|
case MU_MSG_CONTACT_TYPE_BCC:
|
||||||
return prefix(MU_MSG_FIELD_ID_BCC);
|
return prefix(MU_MSG_FIELD_ID_BCC);
|
||||||
default:
|
default:
|
||||||
g_warning ("unsupported contact type %u",
|
g_warning ("unsupported contact type %u",
|
||||||
(unsigned)contact->type);
|
(unsigned)contact->type);
|
||||||
return empty;
|
return empty;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
add_address_subfields (Xapian::Document& doc, const char *addr,
|
add_address_subfields (Xapian::Document& doc, const char *addr,
|
||||||
const std::string& pfx)
|
const std::string& pfx)
|
||||||
{
|
{
|
||||||
const char *at, *domain_part;
|
const char *at, *domain_part;
|
||||||
char *name_part;
|
char *name_part;
|
||||||
|
|
||||||
/* add "foo" and "bar.com" as terms as well for
|
/* add "foo" and "bar.com" as terms as well for
|
||||||
* "foo@bar.com" */
|
* "foo@bar.com" */
|
||||||
if (G_UNLIKELY(!(at = (g_strstr_len (addr, -1, "@")))))
|
if (G_UNLIKELY(!(at = (g_strstr_len (addr, -1, "@")))))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
name_part = g_strndup(addr, at - addr); // foo
|
name_part = g_strndup(addr, at - addr); // foo
|
||||||
domain_part = at + 1;
|
domain_part = at + 1;
|
||||||
|
|
||||||
add_term(doc, pfx + name_part);
|
add_term(doc, pfx + name_part);
|
||||||
add_term(doc, pfx + domain_part);
|
add_term(doc, pfx + domain_part);
|
||||||
|
|
||||||
g_free (name_part);
|
g_free (name_part);
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
each_contact_info (MuMsgContact *contact, MsgDoc *msgdoc)
|
each_contact_info (MuMsgContact *contact, MsgDoc *msgdoc)
|
||||||
{
|
{
|
||||||
/* for now, don't store reply-to addresses */
|
/* for now, don't store reply-to addresses */
|
||||||
if (mu_msg_contact_type (contact) == MU_MSG_CONTACT_TYPE_REPLY_TO)
|
if (mu_msg_contact_type (contact) == MU_MSG_CONTACT_TYPE_REPLY_TO)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
const std::string pfx (xapian_pfx(contact));
|
const std::string pfx (xapian_pfx(contact));
|
||||||
if (pfx.empty())
|
if (pfx.empty())
|
||||||
return TRUE; /* unsupported contact type */
|
return TRUE; /* unsupported contact type */
|
||||||
|
|
||||||
if (!mu_str_is_empty(contact->name)) {
|
if (!mu_str_is_empty(contact->name)) {
|
||||||
Xapian::TermGenerator termgen;
|
Xapian::TermGenerator termgen;
|
||||||
termgen.set_document (*msgdoc->_doc);
|
termgen.set_document (*msgdoc->_doc);
|
||||||
const auto flat = Mu::utf8_flatten(contact->name);
|
const auto flat = Mu::utf8_flatten(contact->name);
|
||||||
termgen.index_text (flat, 1, pfx);
|
termgen.index_text (flat, 1, pfx);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!mu_str_is_empty(contact->email)) {
|
if (!mu_str_is_empty(contact->email)) {
|
||||||
const auto flat = Mu::utf8_flatten(contact->email);
|
const auto flat = Mu::utf8_flatten(contact->email);
|
||||||
add_term(*msgdoc->_doc, pfx + flat);
|
add_term(*msgdoc->_doc, pfx + flat);
|
||||||
add_address_subfields (*msgdoc->_doc, contact->email, pfx);
|
add_address_subfields (*msgdoc->_doc, contact->email, pfx);
|
||||||
/* store it also in our contacts cache */
|
/* store it also in our contacts cache */
|
||||||
auto& contacts{msgdoc->_priv->contacts_};
|
auto& contacts{msgdoc->_priv->contacts_};
|
||||||
contacts.add(Mu::ContactInfo(contact->full_address,
|
contacts.add(Mu::ContactInfo(contact->full_address,
|
||||||
contact->email,
|
contact->email,
|
||||||
contact->name ? contact->name : "",
|
contact->name ? contact->name : "",
|
||||||
msgdoc->_personal,
|
msgdoc->_personal,
|
||||||
mu_msg_get_date(msgdoc->_msg)));
|
mu_msg_get_date(msgdoc->_msg)));
|
||||||
}
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
Xapian::Document
|
Xapian::Document
|
||||||
Store::Private::new_doc_from_message (MuMsg *msg)
|
Store::Private::new_doc_from_message (MuMsg *msg)
|
||||||
{
|
{
|
||||||
Xapian::Document doc;
|
Xapian::Document doc;
|
||||||
MsgDoc docinfo = {&doc, msg, this, 0, NULL};
|
MsgDoc docinfo = {&doc, msg, this, 0, NULL};
|
||||||
|
|
||||||
mu_msg_field_foreach ((MuMsgFieldForeachFunc)add_terms_values, &docinfo);
|
mu_msg_field_foreach ((MuMsgFieldForeachFunc)add_terms_values, &docinfo);
|
||||||
|
|
||||||
mu_msg_contact_foreach
|
mu_msg_contact_foreach
|
||||||
(msg, [](auto contact, gpointer msgdocptr)->gboolean {
|
(msg, [](auto contact, gpointer msgdocptr)->gboolean {
|
||||||
|
|
@ -1023,61 +1023,61 @@ Store::Private::new_doc_from_message (MuMsg *msg)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}, &docinfo);
|
}, &docinfo);
|
||||||
|
|
||||||
/* also store the contact-info as separate terms, and add it
|
/* also store the contact-info as separate terms, and add it
|
||||||
* to the cache */
|
* to the cache */
|
||||||
mu_msg_contact_foreach (msg, (MuMsgContactForeachFunc)each_contact_info,
|
mu_msg_contact_foreach (msg, (MuMsgContactForeachFunc)each_contact_info,
|
||||||
&docinfo);
|
&docinfo);
|
||||||
|
|
||||||
// g_printerr ("\n--%s\n--\n", doc.serialise().c_str());
|
// g_printerr ("\n--%s\n--\n", doc.serialise().c_str());
|
||||||
|
|
||||||
return doc;
|
return doc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
update_threading_info (MuMsg *msg, Xapian::Document& doc)
|
update_threading_info (MuMsg *msg, Xapian::Document& doc)
|
||||||
{
|
{
|
||||||
const GSList *refs;
|
const GSList *refs;
|
||||||
|
|
||||||
// refs contains a list of parent messages, with the oldest
|
// refs contains a list of parent messages, with the oldest
|
||||||
// one first until the last one, which is the direct parent of
|
// one first until the last one, which is the direct parent of
|
||||||
// the current message. of course, it may be empty.
|
// the current message. of course, it may be empty.
|
||||||
//
|
//
|
||||||
// NOTE: there may be cases where the list is truncated; we happily
|
// NOTE: there may be cases where the list is truncated; we happily
|
||||||
// ignore that case.
|
// ignore that case.
|
||||||
refs = mu_msg_get_references (msg);
|
refs = mu_msg_get_references (msg);
|
||||||
|
|
||||||
char thread_id[16+1];
|
char thread_id[16+1];
|
||||||
hash_str(thread_id, sizeof(thread_id),
|
hash_str(thread_id, sizeof(thread_id),
|
||||||
refs ? (const char*)refs->data : mu_msg_get_msgid (msg));
|
refs ? (const char*)refs->data : mu_msg_get_msgid (msg));
|
||||||
|
|
||||||
add_term (doc, prefix(MU_MSG_FIELD_ID_THREAD_ID) + thread_id);
|
add_term (doc, prefix(MU_MSG_FIELD_ID_THREAD_ID) + thread_id);
|
||||||
doc.add_value((Xapian::valueno)MU_MSG_FIELD_ID_THREAD_ID, thread_id);
|
doc.add_value((Xapian::valueno)MU_MSG_FIELD_ID_THREAD_ID, thread_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Xapian::docid
|
Xapian::docid
|
||||||
Store::Private::add_or_update_msg (unsigned docid, MuMsg *msg, GError **err)
|
Store::Private::add_or_update_msg (unsigned docid, MuMsg *msg, GError **err)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (msg, InvalidId);
|
g_return_val_if_fail (msg, InvalidId);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Xapian::Document doc (new_doc_from_message(msg));
|
Xapian::Document doc (new_doc_from_message(msg));
|
||||||
const std::string term (get_uid_term (mu_msg_get_path(msg)));
|
const std::string term (get_uid_term (mu_msg_get_path(msg)));
|
||||||
|
|
||||||
add_term (doc, term);
|
add_term (doc, term);
|
||||||
|
|
||||||
// update the threading info if this message has a message id
|
// update the threading info if this message has a message id
|
||||||
if (mu_msg_get_msgid (msg))
|
if (mu_msg_get_msgid (msg))
|
||||||
update_threading_info (msg, doc);
|
update_threading_info (msg, doc);
|
||||||
|
|
||||||
|
|
||||||
if (docid == 0)
|
if (docid == 0)
|
||||||
return writable_db().replace_document (term, doc);
|
return writable_db().replace_document (term, doc);
|
||||||
|
|
||||||
writable_db().replace_document (docid, doc);
|
writable_db().replace_document (docid, doc);
|
||||||
return docid;
|
return docid;
|
||||||
|
|
||||||
} MU_XAPIAN_CATCH_BLOCK_G_ERROR (err, MU_ERROR_XAPIAN_STORE_FAILED);
|
} MU_XAPIAN_CATCH_BLOCK_G_ERROR (err, MU_ERROR_XAPIAN_STORE_FAILED);
|
||||||
|
|
||||||
return InvalidId;
|
return InvalidId;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue