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

better data encap in searchdata

Browse Source
This commit is contained in:
dockes 2006-11-17 10:08:12 +00:00
parent 48bb4a0dd1
commit a8e0fe31bd
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qtgui/advsearch_w.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: advsearch_w.cpp,v 1.10 2006-11-14 18:29:09 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: advsearch_w.cpp,v 1.11 2006-11-17 10:08:12 dockes Exp $ (C) 2005 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
@ -212,7 +212,7 @@ void AdvSearch::searchPB_clicked()
it != m_clauseWins.end(); it++) { it != m_clauseWins.end(); it++) {
SearchDataClause *cl; SearchDataClause *cl;
if ((cl = (*it)->getClause())) { if ((cl = (*it)->getClause())) {
switch (cl->m_tp) { switch (cl->getTp()) {
case SCLT_EXCL: hasnot = true; break; case SCLT_EXCL: hasnot = true; break;
default: hasnotnot = true; break; default: hasnotnot = true; break;
} }
@ -222,21 +222,20 @@ void AdvSearch::searchPB_clicked()
if (!hasnotnot) { if (!hasnotnot) {
if (!hasnot) if (!hasnot)
return; return;
QMessageBox::warning(0, "Recoll", QMessageBox::warning(0, "Recoll", tr("Cannot execute pure negative"
tr("Cannot execute pure negative query. " "query. Please enter common terms"
"Please enter common terms in the 'any words' field")); " in the 'any words' field"));
return; return;
} }
if (restrictFtCB->isOn() && noFiltypsLB->count() > 0) { if (restrictFtCB->isOn() && noFiltypsLB->count() > 0) {
for (unsigned int i = 0; i < yesFiltypsLB->count(); i++) { for (unsigned int i = 0; i < yesFiltypsLB->count(); i++) {
QCString ctext = yesFiltypsLB->item(i)->text().utf8(); QCString ctext = yesFiltypsLB->item(i)->text().utf8();
sdata->m_filetypes.push_back(string((const char *)ctext)); sdata->addFiletype((const char *)ctext);
} }
} }
if (!subtreeCMB->currentText().isEmpty()) { if (!subtreeCMB->currentText().isEmpty()) {
sdata->m_topdir = sdata->setTopdir((const char*)subtreeCMB->currentText().utf8());
string((const char*)(subtreeCMB->currentText().utf8()));
// The listbox is set for no insertion, do it. Have to check // The listbox is set for no insertion, do it. Have to check
// for dups as the internal feature seems to only work for // for dups as the internal feature seems to only work for
// user-inserted strings // user-inserted strings