mirror of https://github.com/djcb/mu.git
* better error message for some broken queries
This commit is contained in:
parent
df589250ed
commit
13bad9a889
|
@ -386,15 +386,20 @@ get_enquire (MuQuery *self, const char *searchexpr, MuMsgFieldId sortfieldid,
|
||||||
{
|
{
|
||||||
Xapian::Enquire enq (self->db());
|
Xapian::Enquire enq (self->db());
|
||||||
|
|
||||||
/* empty or "" means "matchall" */
|
try {
|
||||||
if (!mu_str_is_empty(searchexpr) &&
|
/* empty or "" means "matchall" */
|
||||||
g_strcmp0 (searchexpr, "\"\"") != 0) /* NULL or "" or """" */
|
if (!mu_str_is_empty(searchexpr) &&
|
||||||
enq.set_query(get_query (self, searchexpr, err));
|
g_strcmp0 (searchexpr, "\"\"") != 0) /* NULL or "" or """" */
|
||||||
else
|
enq.set_query(get_query (self, searchexpr, err));
|
||||||
enq.set_query(Xapian::Query::MatchAll);
|
else
|
||||||
|
enq.set_query(Xapian::Query::MatchAll);
|
||||||
|
} catch (...) {
|
||||||
|
mu_util_g_set_error (err, MU_ERROR_XAPIAN_QUERY,
|
||||||
|
"parse error in query");
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
|
||||||
enq.set_cutoff(0,0);
|
enq.set_cutoff(0,0);
|
||||||
|
|
||||||
return enq;
|
return enq;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -504,14 +509,14 @@ mu_query_run (MuQuery *self, const char *searchexpr, MuMsgFieldId sortfieldid,
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (self, NULL);
|
g_return_val_if_fail (self, NULL);
|
||||||
g_return_val_if_fail (searchexpr, NULL);
|
g_return_val_if_fail (searchexpr, NULL);
|
||||||
g_return_val_if_fail (mu_msg_field_id_is_valid (sortfieldid) ||
|
g_return_val_if_fail (mu_msg_field_id_is_valid (sortfieldid) ||
|
||||||
sortfieldid == MU_MSG_FIELD_ID_NONE,
|
sortfieldid == MU_MSG_FIELD_ID_NONE,
|
||||||
NULL);
|
NULL);
|
||||||
try {
|
try {
|
||||||
MuMsgIter *iter;
|
MuMsgIter *iter;
|
||||||
MuQueryFlags first_flags;
|
MuQueryFlags first_flags;
|
||||||
bool inc_related = flags & MU_QUERY_FLAG_INCLUDE_RELATED;
|
bool inc_related = flags & MU_QUERY_FLAG_INCLUDE_RELATED;
|
||||||
bool descending = flags & MU_QUERY_FLAG_DESCENDING;
|
bool descending = flags & MU_QUERY_FLAG_DESCENDING;
|
||||||
Xapian::Enquire enq (get_enquire(self, searchexpr, sortfieldid,
|
Xapian::Enquire enq (get_enquire(self, searchexpr, sortfieldid,
|
||||||
descending, err));
|
descending, err));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue