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

query: support negative mime and catg clauses: -mime:text/plain

Browse Source
This commit is contained in:
Jean-Francois Dockes
2011-05-15 09:29:24 +02:00
parent b9be9e58d5
commit ce9e9e4d00
4 changed files with 70 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/query/wasatorcl.cpp
+14 -6
View File
@@ -61,11 +61,14 @@ static Rcl::SearchData *wasaQueryToRcl(RclConfig *config, WasaQuery *wasa,
if (!stringicmp("mime", (*it)->m_fieldspec) ||
!stringicmp("format", (*it)->m_fieldspec)) {
if ((*it)->m_op != WasaQuery::OP_LEAF) {
reason = "Negative mime/format clauses not supported yet";
if ((*it)->m_op == WasaQuery::OP_LEAF) {
sdata->addFiletype((*it)->m_value);
} else if ((*it)->m_op == WasaQuery::OP_EXCL) {
sdata->remFiletype((*it)->m_value);
} else {
reason = "internal error: mime clause neither leaf not excl??";
return 0;
}
sdata->addFiletype((*it)->m_value);
continue;
}
@@ -73,8 +76,10 @@ static Rcl::SearchData *wasaQueryToRcl(RclConfig *config, WasaQuery *wasa,
// categories like "audio", "presentation", etc.
if (!stringicmp("rclcat", (*it)->m_fieldspec) ||
!stringicmp("type", (*it)->m_fieldspec)) {
if ((*it)->m_op != WasaQuery::OP_LEAF) {
reason = "Negative rclcat/type clauses not supported yet";
if ((*it)->m_op != WasaQuery::OP_LEAF &&
(*it)->m_op != WasaQuery::OP_EXCL) {
reason = "internal error: rclcat/type clause neither leaf"
"nor excl??";
return 0;
}
list<string> mtypes;
@@ -82,7 +87,10 @@ static Rcl::SearchData *wasaQueryToRcl(RclConfig *config, WasaQuery *wasa,
&& !mtypes.empty()) {
for (list<string>::iterator mit = mtypes.begin();
mit != mtypes.end(); mit++) {
sdata->addFiletype(*mit);
if ((*it)->m_op == WasaQuery::OP_LEAF)
sdata->addFiletype(*mit);
else
sdata->remFiletype(*mit);
}
} else {
reason = "Unknown rclcat/type value: no mime types found";