* cosmetics

This commit is contained in:
Dirk-Jan C. Binnema 2010-11-21 13:41:01 +02:00
parent e9d6540b1f
commit 783d5e4121
3 changed files with 7 additions and 44 deletions

View File

@ -324,7 +324,8 @@ mu_msg_iter_get_flags (MuMsgIter *iter)
MuMsgPrio
mu_msg_iter_get_prio (MuMsgIter *iter)
{
g_return_val_if_fail (!mu_msg_iter_is_done(iter), MU_MSG_PRIO_NONE);
g_return_val_if_fail (!mu_msg_iter_is_done(iter),
MU_MSG_PRIO_NONE);
return static_cast<MuMsgPrio>(mu_msg_iter_get_field_numeric
(iter, MU_MSG_FIELD_ID_PRIO));

View File

@ -58,8 +58,8 @@ init_mu_query (MuQuery *mqx, const char* dbpath)
mu_msg_field_foreach ((MuMsgFieldForEachFunc)add_prefix,
(gpointer)mqx->_qparser);
////// FIXME
// g_print ("synonyms:");
// ////// FIXME
// g_print ("\nsynonyms:\n");
// for (Xapian::TermIterator iter = mqx->_db->synonym_keys_begin();
// iter != mqx->_db->synonym_keys_end(); ++iter) {
// for (Xapian::TermIterator jter = mqx->_db->synonyms_begin(*iter);
@ -145,44 +145,6 @@ add_prefix (MuMsgFieldId mfid, Xapian::QueryParser* qparser)
qparser->add_prefix ("", pfx);
}
} MU_XAPIAN_CATCH_BLOCK;
// try {
// switch (mfid) {
// case MU_MSG_FIELD_ID_FLAGS:
// case MU_MSG_FIELD_ID_MSGID:
// case MU_MSG_FIELD_ID_MAILDIR:
// qparser->add_prefix (shortcut, pfx);
// }
// if (mfid == MU_MSG_FIELD_ID_FLAGS ) {
// return;
// } else if (mfid == MU_MSG_FIELD_ID_MSGID ||
// mfid == MU_MSG_FIELD_ID_MAILDIR) {
// mu_msg_field_type (mfid) != MU_MSG_FIELD_TYPE_STRING ||
// mu_msg_field_xapian_contact(mfid)) {
// qparser->add_boolean_prefix
// (mu_msg_field_name(mfid), pfx);
// qparser->add_boolean_prefix (shortcut, pfx);
// /* make the empty string match this field too*/
// qparser->add_prefix ("", pfx);
// } else {
// qparser->add_boolean_prefix
// (mu_msg_field_name(mfid), pfx);
// qparser->add_prefix (shortcut, pfx);
// /* make the empty string match this field too*/
// qparser->add_prefix ("", pfx);
// }
// } MU_XAPIAN_CATCH_BLOCK;
}
MuQuery*

View File

@ -51,7 +51,7 @@ struct _MuStore {
static void
each_flag (MuMsgFlags flag, Xapian::WritableDatabase *db)
add_synonym_for_flag (MuMsgFlags flag, Xapian::WritableDatabase *db)
{
std::string pfx (1, mu_msg_field_xapian_prefix
(MU_MSG_FIELD_ID_FLAGS));
@ -63,8 +63,8 @@ each_flag (MuMsgFlags flag, Xapian::WritableDatabase *db)
static void
add_synonyms (MuStore *store)
{
mu_msg_flags_foreach ((MuMsgFlagsForeachFunc)each_flag,
store->_db);
mu_msg_flags_foreach ((MuMsgFlagsForeachFunc)add_synonym_for_flag,
store->_db);
}
static gboolean