Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

made the default behavior for multiple keywords search to eb an AND between keywords (emule style)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4314 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-06-20 22:19:34 +00:00
parent 886b366d5c
commit a28b6d0de9
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
retroshare-gui/src/gui/SearchDialog.cpp
View File

@ -34,6 +34,7 @@
#include <retroshare/rsfiles.h> #include <retroshare/rsfiles.h>
#include <retroshare/rsturtle.h> #include <retroshare/rsturtle.h>
#include <retroshare/rsexpr.h>
/* Images for context menu icons */ /* Images for context menu icons */
#define IMAGE_START ":/images/download.png" #define IMAGE_START ":/images/download.png"
@ -590,7 +591,6 @@ void SearchDialog::advancedSearch(Expression* expression)
// resultsToTree((advSearchDialog->getSearchAsString()).toStdString(),req_id+1, results); // resultsToTree((advSearchDialog->getSearchAsString()).toStdString(),req_id+1, results);
} }
void SearchDialog::searchKeywords() void SearchDialog::searchKeywords()
{ {
searchKeywords(ui.lineEdit->text()); searchKeywords(ui.lineEdit->text());
@ -605,10 +605,30 @@ void SearchDialog::searchKeywords(const QString& keywords)
std::cerr << "SearchDialog::searchKeywords() : " << txt << std::endl; std::cerr << "SearchDialog::searchKeywords() : " << txt << std::endl;
QStringList qWords = keywords.split(" ", QString::SkipEmptyParts);
std::list<std::string> words;
QStringListIterator qWordsIter(qWords);
while (qWordsIter.hasNext())
words.push_back(qWordsIter.next().toStdString());
int n = words.size() ;
if (n < 1)
return;
NameExpression exprs(ContainsAllStrings,words,false) ;
LinearizedExpression lin_exp ;
exprs.linearize(lin_exp) ;
TurtleRequestId req_id ; TurtleRequestId req_id ;
if(ui._anonF2Fsearch_CB->isChecked()) if(ui._anonF2Fsearch_CB->isChecked())
{
if(n==1)
req_id = rsTurtle->turtleSearch(txt) ; req_id = rsTurtle->turtleSearch(txt) ;
else
req_id = rsTurtle->turtleSearch(lin_exp) ;
}
else else
req_id = (((uint32_t)rand()) << 16)^0x1e2fd5e4 + ((uint32_t)rand())^0x1b19acfe ; // generate a random 32 bits request id req_id = (((uint32_t)rand()) << 16)^0x1e2fd5e4 + ((uint32_t)rand())^0x1b19acfe ; // generate a random 32 bits request id
@ -617,19 +637,8 @@ void SearchDialog::searchKeywords(const QString& keywords)
if(ui._friendListsearch_SB->isChecked() || ui._ownFiles_CB->isChecked()) if(ui._friendListsearch_SB->isChecked() || ui._ownFiles_CB->isChecked())
{ {
/* extract keywords from lineEdit */ /* extract keywords from lineEdit */
QStringList qWords = keywords.split(" ", QString::SkipEmptyParts); // make a compound expression with an AND
std::list<std::string> words; //
QStringListIterator qWordsIter(qWords);
while (qWordsIter.hasNext())
{
words.push_back(qWordsIter.next().toStdString());
}
if (words.size() < 1)
{
/* ignore */
return;
}
std::list<DirDetails> finalResults ; std::list<DirDetails> finalResults ;
@ -637,7 +646,7 @@ void SearchDialog::searchKeywords(const QString& keywords)
{ {
std::list<DirDetails> initialResults; std::list<DirDetails> initialResults;
rsFiles -> SearchKeywords(words, initialResults, DIR_FLAGS_REMOTE) ; rsFiles->SearchBoolExp(&exprs, initialResults, DIR_FLAGS_REMOTE) ;
/* which extensions do we use? */ /* which extensions do we use? */
DirDetails dd; DirDetails dd;
@ -653,7 +662,7 @@ void SearchDialog::searchKeywords(const QString& keywords)
{ {
std::list<DirDetails> initialResults; std::list<DirDetails> initialResults;
rsFiles -> SearchKeywords(words, initialResults, DIR_FLAGS_LOCAL | DIR_FLAGS_NETWORK_WIDE | DIR_FLAGS_BROWSABLE) ; rsFiles->SearchBoolExp(&exprs, initialResults, DIR_FLAGS_LOCAL | DIR_FLAGS_NETWORK_WIDE | DIR_FLAGS_BROWSABLE) ;
/* which extensions do we use? */ /* which extensions do we use? */
DirDetails dd; DirDetails dd;