tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add rclcat prefix to query languages + adapt find_applet to use it

Browse Source
This commit is contained in:
dockes 2007-10-05 14:00:04 +00:00
parent 072a0c4373
commit 5fc09123aa
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/query/wasatorcl.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: wasatorcl.cpp,v 1.9 2007-06-22 06:14:04 dockes Exp $ (C) 2006 J.F.Dockes"; static char rcsid[] = "@(#$Id: wasatorcl.cpp,v 1.10 2007-10-05 14:00:04 dockes Exp $ (C) 2006 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -17,12 +17,18 @@ static char rcsid[] = "@(#$Id: wasatorcl.cpp,v 1.9 2007-06-22 06:14:04 dockes Ex
* Free Software Foundation, Inc., * Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <string>
#include <list>
using std::string;
using std::list;
#include "wasastringtoquery.h" #include "wasastringtoquery.h"
#include "rcldb.h" #include "rcldb.h"
#include "searchdata.h" #include "searchdata.h"
#include "wasatorcl.h" #include "wasatorcl.h"
#include "debuglog.h" #include "debuglog.h"
#include "smallut.h" #include "smallut.h"
#include "rclconfig.h"
Rcl::SearchData *wasaStringToRcl(const string &qs, string &reason) Rcl::SearchData *wasaStringToRcl(const string &qs, string &reason)
{ {
@ -56,11 +62,23 @@ Rcl::SearchData *wasaQueryToRcl(WasaQuery *wasa)
// ?? // ??
continue; continue;
case WasaQuery::OP_LEAF: case WasaQuery::OP_LEAF:
// Special case for mime. Not pretty.
// Special cases for mime and category. Not pretty.
if (!stringicmp("mime", (*it)->m_fieldspec)) { if (!stringicmp("mime", (*it)->m_fieldspec)) {
sdata->addFiletype((*it)->m_value); sdata->addFiletype((*it)->m_value);
break; break;
} }
if (!stringicmp("rclcat", (*it)->m_fieldspec)) {
RclConfig *conf = RclConfig::getMainConfig();
list<string> mtypes;
if (conf && conf->getMimeCatTypes((*it)->m_value, mtypes)) {
for (list<string>::iterator mit = mtypes.begin();
mit != mtypes.end(); mit++) {
sdata->addFiletype(*mit);
}
}
break;
}
if ((*it)->m_value.find_first_of(" \t\n\r") != string::npos) { if ((*it)->m_value.find_first_of(" \t\n\r") != string::npos) {
nclause = new Rcl::SearchDataClauseDist(Rcl::SCLT_PHRASE, nclause = new Rcl::SearchDataClauseDist(Rcl::SCLT_PHRASE,