debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Print information about where Xapian exception occurred.

Browse source 
Previously, our Xapian exception reports where identical so they
were hard to track down.
This commit is contained in:
Carl Worth 2009-11-22 03:41:30 +01:00
parent 6c7ec294bb
commit 591f901241
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/database.cc
View file

@ -513,7 +513,7 @@ notmuch_database_open (const char *path,
notmuch->query_parser->add_prefix (prefix->name, prefix->prefix); notmuch->query_parser->add_prefix (prefix->name, prefix->prefix);
} }
} catch (const Xapian::Error &error) { } catch (const Xapian::Error &error) {
fprintf (stderr, "A Xapian exception occurred: %s\n", fprintf (stderr, "A Xapian exception occurred opening database: %s\n",
error.get_msg().c_str()); error.get_msg().c_str());
notmuch = NULL; notmuch = NULL;
} }
@ -608,8 +608,8 @@ notmuch_database_set_timestamp (notmuch_database_t *notmuch,
db->replace_document (doc_id, doc); db->replace_document (doc_id, doc);
} }
} catch (Xapian::Error &error) { } catch (const Xapian::Error &error) {
fprintf (stderr, "A Xapian exception occurred: %s.\n", fprintf (stderr, "A Xapian exception occurred setting timestamp: %s.\n",
error.get_msg().c_str()); error.get_msg().c_str());
ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION; ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
} }
@ -983,8 +983,8 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
_notmuch_message_sync (message); _notmuch_message_sync (message);
} catch (const Xapian::Error &error) { } catch (const Xapian::Error &error) {
fprintf (stderr, "A Xapian exception occurred: %s.\n", fprintf (stderr, "A Xapian exception occurred adding message: %s.\n",
error.get_msg().c_str()); error.get_description().c_str());
ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION; ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
goto DONE; goto DONE;
} }

2
lib/query.cc
View file

@ -149,7 +149,7 @@ notmuch_query_search_messages (notmuch_query_t *query,
} }
} catch (const Xapian::Error &error) { } catch (const Xapian::Error &error) {
fprintf (stderr, "A Xapian exception occurred: %s\n", fprintf (stderr, "A Xapian exception occurred performing query: %s\n",
error.get_msg().c_str()); error.get_msg().c_str());
fprintf (stderr, "Query string was: %s\n", query->query_string); fprintf (stderr, "Query string was: %s\n", query->query_string);
} }