emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* mu-query.cc: make queries a bit more eager to match (WIP) 

ie., convert to lowercase, do STEM_SOME, not STEM_ALL
  this needs tweaking, more testing, but passed current unit tests
This commit is contained in:
Dirk-Jan C. Binnema 2010-09-09 08:21:01 +03:00
parent b4d7ea5a36
commit 55981b27df
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/mu-query.cc
View File

@ -54,7 +54,7 @@ init_mu_query (MuQuery *mqx, const char* dbpath)
mqx->_qparser->set_database(*mqx->_db);
mqx->_qparser->set_default_op(Xapian::Query::OP_AND);
mqx->_qparser->set_stemming_strategy
(Xapian::QueryParser::STEM_SOME);
(Xapian::QueryParser::STEM_ALL);
memset (mqx->_sorters, 0, sizeof(mqx->_sorters));
mu_msg_field_foreach ((MuMsgFieldForEachFunc)add_prefix,
@ -171,6 +171,29 @@ mu_query_destroy (MuQuery *self)
g_free (self);
}
/* preprocess a query to make them a bit more permissive */
gchar*
query_preprocess (const char *query)
{
gchar *my_query;
//gchar *cur;
/* translate the the searchexpr to all lowercase; this
* fill fixes some of the false-negatives. A full fix
* probably require some custom query parser.
*/
my_query = g_utf8_strdown (query, -1);
/* replace @ with ' '; this fixes some other Xapian issues.
* should be done in a bit nice way though...
*/
// for (cur = my_query; *cur; ++cur)
// if (*cur == '@')
// *cur = ' ';
return my_query;
}
MuMsgIter*
mu_query_run (MuQuery *self, const char* searchexpr,
@ -181,23 +204,18 @@ mu_query_run (MuQuery *self, const char* searchexpr,
g_return_val_if_fail (searchexpr, NULL);
try {
char *lower_expr;
char *preprocessed;
int err (0);
/* translate the the searchexpr to all lowercase; this
* fill fixes some of the false-negatives. A full fix
* probably require some custom query parser.
*/
lower_expr = g_utf8_strdown (searchexpr, -1);
preprocessed = query_preprocess (searchexpr);
Xapian::Query q(get_query(self, lower_expr, &err));
Xapian::Query q(get_query(self, preprocessed, &err));
if (err) {
g_warning ("Error in query '%s'", lower_expr);
g_free (lower_expr);
g_warning ("Error in query '%s'", preprocessed);
g_free (preprocessed);
return NULL;
}
g_free (lower_expr);
g_free (preprocessed);
Xapian::Enquire enq (*self->_db);