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

* mu-query.cc: some cleanups, cosmetics

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-09-03 10:49:51 +03:00
parent 8d52c8b5a1
commit 53c2c91d3a
1 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/mu-query.cc
View File

@ -49,8 +49,6 @@ public:
if (!clear_prefix (begin)) if (!clear_prefix (begin))
return Xapian::BAD_VALUENO; return Xapian::BAD_VALUENO;
begin = to_sortable (begin, true); begin = to_sortable (begin, true);
end = to_sortable (end, false); end = to_sortable (end, false);
@ -158,10 +156,8 @@ static void add_prefix (MuMsgFieldId field, Xapian::QueryParser* qparser);
struct _MuQuery { struct _MuQuery {
public: public:
_MuQuery (MuStore *store): _db(0), _store(mu_store_ref(store)) { _MuQuery (MuStore *store): _store(mu_store_ref(store)) {
_db = reinterpret_cast<Xapian::Database*>
(mu_store_get_read_only_database (store));
_qparser.set_database (db()); _qparser.set_database (db());
_qparser.set_default_op (Xapian::Query::OP_AND); _qparser.set_default_op (Xapian::Query::OP_AND);
@ -174,7 +170,14 @@ public:
~_MuQuery () { mu_store_unref (_store); } ~_MuQuery () { mu_store_unref (_store); }
Xapian::Database& db() const { return *_db; } Xapian::Database& db() const {
Xapian::Database* db;
db = reinterpret_cast<Xapian::Database*>
(mu_store_get_read_only_database (_store));
if (!db)
throw std::runtime_error ("no database");
return *db;
}
Xapian::QueryParser& query_parser () { return _qparser; } Xapian::QueryParser& query_parser () { return _qparser; }
private: private:
@ -182,7 +185,6 @@ private:
MuDateRangeProcessor _date_range_processor; MuDateRangeProcessor _date_range_processor;
MuSizeRangeProcessor _size_range_processor; MuSizeRangeProcessor _size_range_processor;
Xapian::Database *_db;
MuStore *_store; MuStore *_store;
}; };
@ -251,28 +253,17 @@ mu_query_new (MuStore *store, GError **err)
{ {
g_return_val_if_fail (store, NULL); g_return_val_if_fail (store, NULL);
// if (!mu_util_check_dir (xpath, TRUE, FALSE)) { if (mu_store_count (store, err) == 0) {
// g_set_error (err, 0, MU_ERROR_XAPIAN_DIR_NOT_ACCESSIBLE, g_set_error (err, 0, MU_ERROR_XAPIAN_IS_EMPTY,
// "'%s' is not a readable xapian dir", xpath); "database is empty");
// return NULL; return 0;
// } }
// if (mu_store_database_needs_upgrade (xpath)) {
// g_set_error (err, 0, MU_ERROR_XAPIAN_NOT_UP_TO_DATE,
// "%s is not up-to-date, needs a full update",
// xpath);
// return NULL;
// }
if (mu_store_count (store) == 0)
g_warning ("database is empty; nothing to do");
try { try {
return new MuQuery (store); return new MuQuery (store);
} MU_XAPIAN_CATCH_BLOCK_G_ERROR_RETURN (err, MU_ERROR_XAPIAN, NULL); } MU_XAPIAN_CATCH_BLOCK_G_ERROR_RETURN (err,
MU_ERROR_XAPIAN, NULL);
return 0; return 0;
} }
@ -327,7 +318,6 @@ mu_query_run (MuQuery *self, const char* searchexpr, gboolean threads,
else else
enq.set_query(Xapian::Query::MatchAll); enq.set_query(Xapian::Query::MatchAll);
enq.set_cutoff(0,0); enq.set_cutoff(0,0);
return mu_msg_iter_new ( return mu_msg_iter_new (