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

only lowercase field name once

Browse Source
This commit is contained in:
Jean-Francois Dockes 2015-08-08 11:07:06 +02:00
parent 74faf031a5
commit 79d419a010
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/query/wasaparseaux.cpp
View File

@ -108,11 +108,11 @@ bool WasaParserDriver::addClause(SearchData *sd,
return sd->addClause(cl); return sd->addClause(cl);
} }
const string& ofld = cl->getfield();
const string& fld = cl->getfield(); string fld = stringtolower(ofld);
// MIME types and categories // MIME types and categories
if (!stringicmp("mime", fld) ||!stringicmp("format", fld)) { if (!fld.compare("mime") || !fld.compare("format")) {
if (cl->getexclude()) { if (cl->getexclude()) {
sd->remFiletype(cl->gettext()); sd->remFiletype(cl->gettext());
} else { } else {
@ -122,7 +122,7 @@ bool WasaParserDriver::addClause(SearchData *sd,
return true; return true;
} }
if (!stringicmp("rclcat", fld) || !stringicmp("type", fld)) { if (!fld.compare("rclcat") || !fld.compare("type")) {
vector<string> mtypes; vector<string> mtypes;
if (m_config && m_config->getMimeCatTypes(cl->gettext(), mtypes)) { if (m_config && m_config->getMimeCatTypes(cl->gettext(), mtypes)) {
for (vector<string>::iterator mit = mtypes.begin(); for (vector<string>::iterator mit = mtypes.begin();
@ -139,7 +139,7 @@ bool WasaParserDriver::addClause(SearchData *sd,
} }
// Handle "date" spec // Handle "date" spec
if (!stringicmp("date", fld)) { if (!fld.compare("date")) {
DateInterval di; DateInterval di;
if (!parsedateinterval(cl->gettext(), &di)) { if (!parsedateinterval(cl->gettext(), &di)) {
LOGERR(("Bad date interval format: %s\n", LOGERR(("Bad date interval format: %s\n",
@ -156,7 +156,7 @@ bool WasaParserDriver::addClause(SearchData *sd,
} }
// Handle "size" spec // Handle "size" spec
if (!stringicmp("size", fld)) { if (!fld.compare("size")) {
char *cp; char *cp;
size_t size = strtoll(cl->gettext().c_str(), &cp, 10); size_t size = strtoll(cl->gettext().c_str(), &cp, 10);
if (*cp != 0) { if (*cp != 0) {
@ -196,7 +196,7 @@ bool WasaParserDriver::addClause(SearchData *sd,
return true; return true;
} }
if (!stringicmp("dir", fld)) { if (!fld.compare("dir")) {
// dir filtering special case // dir filtering special case
SearchDataClausePath *nclause = SearchDataClausePath *nclause =
new SearchDataClausePath(cl->gettext(), cl->getexclude()); new SearchDataClausePath(cl->gettext(), cl->getexclude());
@ -226,11 +226,10 @@ bool WasaParserDriver::addClause(SearchData *sd,
if (tp != SCLT_FILENAME) { if (tp != SCLT_FILENAME) {
SearchDataClauseSimple *ncl = SearchDataClauseSimple *ncl =
new SearchDataClauseSimple(tp, ns, fld); new SearchDataClauseSimple(tp, ns, ofld);
delete cl; delete cl;
return sd->addClause(ncl); return sd->addClause(ncl);
} }
} }
return sd->addClause(cl); return sd->addClause(cl);
} }