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

replaced SCLT_EXCL clauses with general excl/neg flag

Browse Source
This commit is contained in:
Jean-Francois Dockes
2013-01-05 18:15:54 +01:00
parent cbc269abb1
commit 1b38c5c98c
9 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qtgui/advshist.cpp
+14 -1
View File
@@ -57,6 +57,7 @@ private:
slack = 0;
d = m = y = di.d1 = di.m1 = di.y1 = di.d2 = di.m2 = di.y2 = 0;
hasdates = false;
exclude = false;
}
// Temporary data while parsing.
@@ -67,6 +68,7 @@ private:
int d, m, y;
DateInterval di;
bool hasdates;
bool exclude;
};
bool SDHXMLHandler::startElement(const QString & /* namespaceURI */,
@@ -101,6 +103,8 @@ bool SDHXMLHandler::endElement(const QString & /* namespaceURI */,
}
} else if (qName == "CT") {
whatclause = currentText.trimmed();
} else if (qName == "NEG") {
exclude = true;
} else if (qName == "F") {
field = base64_decode(qs2utf8s(currentText.trimmed()));
} else if (qName == "T") {
@@ -111,16 +115,24 @@ bool SDHXMLHandler::endElement(const QString & /* namespaceURI */,
SearchDataClause *c;
if (whatclause == "AND" || whatclause.isEmpty()) {
c = new SearchDataClauseSimple(SCLT_AND, text, field);
c->setexclude(exclude);
} else if (whatclause == "OR") {
c = new SearchDataClauseSimple(SCLT_OR, text, field);
c->setexclude(exclude);
} else if (whatclause == "EX") {
c = new SearchDataClauseSimple(SCLT_EXCL, text, field);
// Compat with old hist. We don't generete EX (SCLT_EXCL) anymore
// it's replaced with OR + exclude flag
c = new SearchDataClauseSimple(SCLT_OR, text, field);
c->setexclude(true);
} else if (whatclause == "FN") {
c = new SearchDataClauseFilename(text);
c->setexclude(exclude);
} else if (whatclause == "PH") {
c = new SearchDataClauseDist(SCLT_PHRASE, text, slack, field);
c->setexclude(exclude);
} else if (whatclause == "NE") {
c = new SearchDataClauseDist(SCLT_NEAR, text, slack, field);
c->setexclude(exclude);
} else {
LOGERR(("Bad clause type [%s]\n", qs2utf8s(whatclause).c_str()));
return false;
@@ -130,6 +142,7 @@ bool SDHXMLHandler::endElement(const QString & /* namespaceURI */,
text.clear();
field.clear();
slack = 0;
exclude = false;
} else if (qName == "D") {
d = atoi((const char *)currentText.toAscii());
} else if (qName == "M") {
src/qtgui/searchclause_w.cpp
+8 -4
View File
@@ -119,7 +119,12 @@ SearchDataClause *SearchClauseW::getClause()
case 1:
return new SearchDataClauseSimple(SCLT_AND, text, field);
case 2:
return new SearchDataClauseSimple(SCLT_EXCL, text, field);
{
SearchDataClauseSimple *cl =
new SearchDataClauseSimple(SCLT_OR, text, field);
cl->setexclude(true);
return cl;
}
case 3:
return new SearchDataClauseDist(SCLT_PHRASE, text,
proxSlackSB->value(), field);
@@ -139,9 +144,8 @@ void SearchClauseW::setFromClause(SearchDataClauseSimple *cl)
{
LOGDEB(("SearchClauseW::setFromClause\n"));
switch(cl->getTp()) {
case SCLT_OR: tpChange(0); break;
case SCLT_OR: if (cl->getexclude()) tpChange(2); else tpChange(0); break;
case SCLT_AND: tpChange(1); break;
case SCLT_EXCL: tpChange(2); break;
case SCLT_PHRASE: tpChange(3); break;
case SCLT_NEAR: tpChange(4); break;
case SCLT_FILENAME: tpChange(5); break;
@@ -154,7 +158,7 @@ void SearchClauseW::setFromClause(SearchDataClauseSimple *cl)
QString field = QString::fromUtf8(cl->getfield().c_str());
switch(cl->getTp()) {
case SCLT_OR: case SCLT_AND: case SCLT_EXCL:
case SCLT_OR: case SCLT_AND:
case SCLT_PHRASE: case SCLT_NEAR:
if (!field.isEmpty()) {
int idx = fldCMB->findText(field);