Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-12 19:12:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

turtle search is now working. Next task: update search gui

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-03-15 22:45:40 +00:00
parent 148c918ae1
commit 7b84b125df
26 changed files with 2329 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/SearchDialog.cpp
View file

@ -26,9 +26,6 @@
#include "rsiface/rsexpr.h"
#include "rsiface/rsfiles.h"
#include "rsiface/rspeers.h"
#ifdef TURTLE_HOPPING
#include "rsiface/rsturtle.h"
#endif
#include "util/misc.h"
#include <iostream>
@ -419,12 +416,6 @@ void SearchDialog::advancedSearch(Expression* expression)
void SearchDialog::searchKeywords()
{
#ifdef TURTLE_HOPPING
QString qTxt = ui.lineEdit->text();
std::string txt = qTxt.toStdString();
TurtleRequestId id = rsTurtle->turtleSearch(txt) ;
#else
QString qTxt = ui.lineEdit->text();
std::string txt = qTxt.toStdString();
@ -449,7 +440,7 @@ void SearchDialog::searchKeywords()
std::list<FileDetail> initialResults;
std::list<FileDetail> * finalResults = 0;
rsFiles -> SearchKeywords(words, initialResults);
rsFiles -> SearchKeywords(words, initialResults,DIR_FLAGS_LOCAL | DIR_FLAGS_REMOTE);
/* which extensions do we use? */
QString qExt, qName;
int extIndex;
@ -497,7 +488,6 @@ void SearchDialog::searchKeywords()
/* abstraction to allow reusee of tree rendering code */
resultsToTree(txt, *finalResults);
#endif
}
void SearchDialog::resultsToTree(std::string txt, std::list<FileDetail> results)