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

* mu-store-write.cc: cleaunp

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-09-12 20:51:01 +03:00
parent 1f4e55865c
commit c35923b467
1 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/mu-store-write.cc
View File

@ -557,11 +557,12 @@ each_contact_info (MuMsgContact *contact, MsgDoc *msgdoc)
} }
gboolean unsigned
mu_store_store_msg (MuStore *store, MuMsg *msg, gboolean replace) mu_store_add_msg (MuStore *store, MuMsg *msg, gboolean replace,
GError **err)
{ {
g_return_val_if_fail (store, FALSE); g_return_val_if_fail (store, MU_STORE_INVALID_DOCID);
g_return_val_if_fail (msg, FALSE); g_return_val_if_fail (msg, MU_STORE_INVALID_DOCID);
try { try {
Xapian::Document newdoc; Xapian::Document newdoc;
@ -595,49 +596,35 @@ mu_store_store_msg (MuStore *store, MuMsg *msg, gboolean replace)
if (store->inc_processed() % store->batch_size() == 0) if (store->inc_processed() % store->batch_size() == 0)
store->commit_transaction(); store->commit_transaction();
return TRUE; return id;
} MU_XAPIAN_CATCH_BLOCK; } MU_XAPIAN_CATCH_BLOCK_G_ERROR (err, MU_ERROR_XAPIAN_STORE_FAILED);
if (store->in_transaction()) if (store->in_transaction())
store->rollback_transaction(); store->rollback_transaction();
return FALSE; return MU_STORE_INVALID_DOCID;
} }
/* FIXME: use GError */ unsigned
gboolean mu_store_add_path (MuStore *store, const char *path, GError **err)
mu_store_store_path (MuStore *store, const char *path)
{ {
MuMsg *msg; MuMsg *msg;
GError *err; unsigned docid;
gboolean rv;
g_return_val_if_fail (store, FALSE); g_return_val_if_fail (store, FALSE);
g_return_val_if_fail (path, FALSE); g_return_val_if_fail (path, FALSE);
err = NULL; err = NULL;
msg = mu_msg_new_from_file (path, NULL, &err); msg = mu_msg_new_from_file (path, NULL, err);
if (!msg)
if (!msg) { return MU_STORE_INVALID_DOCID;
if (err) {
g_warning ("failed to create message %s to store: %s",
path, err->message);
g_error_free (err);
} else
g_warning ("failed to create message %s to store", path);
return FALSE;
}
rv = mu_store_store_msg (store, msg, TRUE);
if (!rv)
g_warning ("failed to store %s", path);
docid = mu_store_add_msg (store, msg, TRUE, err);
mu_msg_unref (msg); mu_msg_unref (msg);
return rv; return docid;
} }