Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-27 15:57:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

WIP Plug deep search into GXS search

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2018-07-20 15:29:37 +02:00
parent a31b06ab60
commit 3fc9ff3fef
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libretroshare/src/gxs/rsgxsnetservice.cc
View File

@ -260,6 +260,10 @@
#include "util/rsmemory.h" #include "util/rsmemory.h"
#include "util/stacktrace.h" #include "util/stacktrace.h"
#ifdef RS_DEEP_SEARCH
# include "deep_search/deep_search.h"
#endif
/*** /***
* Use the following defines to debug: * Use the following defines to debug:
NXS_NET_DEBUG_0 shows group update high level information NXS_NET_DEBUG_0 shows group update high level information
@ -5271,16 +5275,52 @@ void RsGxsNetService::receiveTurtleSearchResults(TurtleRequestId req,const unsig
mObserver->receiveNewGroups(new_grps); mObserver->receiveNewGroups(new_grps);
} }
bool RsGxsNetService::search(const std::string& substring,std::list<RsGxsGroupSummary>& group_infos) bool RsGxsNetService::search( const std::string& substring,
std::list<RsGxsGroupSummary>& group_infos )
{ {
group_infos.clear();
RsGxsGrpMetaTemporaryMap grpMetaMap; RsGxsGrpMetaTemporaryMap grpMetaMap;
{ {
RS_STACK_MUTEX(mNxsMutex) ; RS_STACK_MUTEX(mNxsMutex) ;
mDataStore->retrieveGxsGrpMetaData(grpMetaMap); mDataStore->retrieveGxsGrpMetaData(grpMetaMap);
} }
RsGroupNetworkStats stats ; #ifdef RS_DEEP_SEARCH
std::vector<DeepSearch::SearchResult> results;
DeepSearch::search(substring, results, 0);
for(auto dsr : results)
{
RsUrl rUrl(dsr.mUrl);
auto rit = rUrl.query().find("id");
if(rit != rUrl.query().end())
{
RsGroupNetworkStats stats;
RsGxsGroupId grpId(rit->second);
RsGxsGrpMetaTemporaryMap::iterator mIt;
if( !grpId.isNull() &&
(mIt = grpMetaMap.find(grpId)) != grpMetaMap.end() &&
getGroupNetworkStats(grpId, stats) )
{
RsGxsGrpMetaData& gMeta(*mIt->second);
RsGxsGroupSummary s;
s.group_id = grpId;
s.group_name = gMeta.mGroupName;
s.search_context = dsr.mSnippet;
s.sign_flags = gMeta.mSignFlags;
s.publish_ts = gMeta.mSignFlags;
s.author_id = gMeta.mAuthorId;
s.number_of_messages = stats.mMaxVisibleCount;
s.last_message_ts = stats.mLastGroupModificationTS;
s.popularity = gMeta.mPop;
group_infos.push_back(s);
}
}
}
#else // RS_DEEP_SEARCH
RsGroupNetworkStats stats ;
for(auto it(grpMetaMap.begin());it!=grpMetaMap.end();++it) for(auto it(grpMetaMap.begin());it!=grpMetaMap.end();++it)
if(termSearch(it->second->mGroupName,substring)) if(termSearch(it->second->mGroupName,substring))
{ {
@ -5289,7 +5329,7 @@ bool RsGxsNetService::search(const std::string& substring,std::list<RsGxsGroupSu
RsGxsGroupSummary s ; RsGxsGroupSummary s ;
s.group_id = it->first ; s.group_id = it->first ;
s.group_name = it->second->mGroupName ; s.group_name = it->second->mGroupName ;
s.group_description = it->second->mGroupName ; // to be filled with something better when we use the real search // to be filled with something better when we use the real search
s.search_context = it->second->mGroupName ; s.search_context = it->second->mGroupName ;
s.sign_flags = it->second->mSignFlags; s.sign_flags = it->second->mSignFlags;
s.publish_ts = it->second->mPublishTs; s.publish_ts = it->second->mPublishTs;
@ -5298,8 +5338,9 @@ bool RsGxsNetService::search(const std::string& substring,std::list<RsGxsGroupSu
s.last_message_ts = stats.mLastGroupModificationTS ; s.last_message_ts = stats.mLastGroupModificationTS ;
s.popularity = it->second->mPop; s.popularity = it->second->mPop;
group_infos.push_back(s) ; group_infos.push_back(s);
} }
#endif // RS_DEEP_SEARCH
#ifdef NXS_NET_DEBUG_8 #ifdef NXS_NET_DEBUG_8
GXSNETDEBUG___ << " performing local substring search in response to distant request. Found " << group_infos.size() << " responses." << std::endl; GXSNETDEBUG___ << " performing local substring search in response to distant request. Found " << group_infos.size() << " responses." << std::endl;

3
libretroshare/src/retroshare/rsgxsiface.h
View File

@ -31,6 +31,7 @@
#include "retroshare/rsgxsservice.h" #include "retroshare/rsgxsservice.h"
#include "gxs/rsgxsdata.h" #include "gxs/rsgxsdata.h"
#include "retroshare/rsgxsifacetypes.h" #include "retroshare/rsgxsifacetypes.h"
#include "util/rsdeprecate.h"
/*! /*!
* \brief The RsGxsGroupSymmary struct * \brief The RsGxsGroupSymmary struct
@ -45,7 +46,7 @@ struct RsGxsGroupSummary
RsGxsGroupId group_id ; RsGxsGroupId group_id ;
std::string group_name ; std::string group_name ;
std::string group_description ; RS_DEPRECATED std::string group_description;
std::string search_context ; std::string search_context ;
RsGxsId author_id ; RsGxsId author_id ;
time_t publish_ts ; time_t publish_ts ;