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

define new searchdataclausepath to replace the old dir: filtering mechanism. ORing dirs now works

Browse Source
This commit is contained in:
Jean-Francois Dockes
2013-01-05 16:21:30 +01:00
parent 9e88426d13
commit cbc269abb1
10 changed files with 200 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qtgui/advsearch_w.cpp
+19 -16
View File
@@ -384,9 +384,9 @@ void AdvSearch::runSearch()
string cat;
if ((qit = cat_rtranslations.find(qcat)) !=
cat_rtranslations.end()) {
cat = (const char *)qit->second.toUtf8();
cat = qs2utf8s(qit->second);
} else {
cat = (const char *)qcat.toUtf8();
cat = qs2utf8s(qcat);
}
vector<string> types;
theconfig->getMimeCatTypes(cat, types);
@@ -395,8 +395,7 @@ void AdvSearch::runSearch()
sdata->addFiletype(*it);
}
} else {
sdata->addFiletype((const char *)
yesFiltypsLB->item(i)->text().toUtf8());
sdata->addFiletype(qs2utf8s(yesFiltypsLB->item(i)->text()));
}
}
}
@@ -422,8 +421,9 @@ void AdvSearch::runSearch()
if (!subtreeCMB->currentText().isEmpty()) {
QString current = subtreeCMB->currentText();
sdata->addDirSpec((const char*)subtreeCMB->currentText().toUtf8(),
direxclCB->isChecked());
sdata->addClause(new Rcl::SearchDataClausePath(
(const char*)current.toLocal8Bit(),
direxclCB->isChecked()));
// Keep history clean and sorted. Maybe there would be a
// simpler way to do this
list<QString> entries;
@@ -463,12 +463,25 @@ void AdvSearch::fromSearch(RefCntr<SearchData> sdata)
addClause();
}
subtreeCMB->setEditText("");
direxclCB->setChecked(0);
for (unsigned int i = 0; i < sdata->m_query.size(); i++) {
// Set fields from clause
if (sdata->m_query[i]->getTp() == SCLT_SUB) {
LOGERR(("AdvSearch::fromSearch: SUB clause found !\n"));
continue;
}
if (sdata->m_query[i]->getTp() == SCLT_PATH) {
SearchDataClausePath *cs =
dynamic_cast<SearchDataClausePath*>(sdata->m_query[i]);
// We can only use one such clause. There should be only one too
// if this is sfrom aved search data.
QString qdir = QString::fromLocal8Bit(cs->gettext().c_str());
subtreeCMB->setEditText(qdir);
direxclCB->setChecked(cs->getexclude());
continue;
}
SearchDataClauseSimple *cs =
dynamic_cast<SearchDataClauseSimple*>(sdata->m_query[i]);
m_clauseWins[i]->setFromClause(cs);
@@ -531,16 +544,6 @@ void AdvSearch::fromSearch(RefCntr<SearchData> sdata)
minSizeLE->setText("");
maxSizeLE->setText("");
}
if (!sdata->m_dirspecs.empty()) {
// Can only use one entry
QString qdir = QString::fromLocal8Bit(sdata->m_dirspecs[0].dir.c_str());
subtreeCMB->setEditText(qdir);
direxclCB->setChecked(sdata->m_dirspecs[0].exclude);
} else {
subtreeCMB->setEditText("");
direxclCB->setChecked(0);
}
}
void AdvSearch::slotHistoryNext()
src/qtgui/advshist.cpp
+3 -3
View File
@@ -29,8 +29,8 @@ using namespace Rcl;
class SDHXMLHandler : public QXmlDefaultHandler {
public:
SDHXMLHandler()
: slack(0)
{
resetTemps();
}
bool startElement(const QString & /* namespaceURI */,
const QString & /* localName */,
@@ -165,11 +165,11 @@ bool SDHXMLHandler::endElement(const QString & /* namespaceURI */,
} else if (qName == "YD") {
string d;
base64_decode((const char*)currentText.trimmed().toAscii(), d);
sd->addDirSpec(d);
sd->addClause(new SearchDataClausePath(d));
} else if (qName == "ND") {
string d;
base64_decode((const char*)currentText.trimmed().toAscii(), d);
sd->addDirSpec(d, true);
sd->addClause(new SearchDataClausePath(d, true));
} else if (qName == "SD") {
// Closing current search descriptor. Finishing touches...
if (hasdates)