ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better store the scope-ID within a query

Browse source
This commit is contained in:
Fischlurch 2010-01-18 09:49:22 +01:00
parent 018801895b
commit a9a6bb3951
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/proc/mobject/session/placement-index-query-resolver.cpp
View file

@ -253,14 +253,14 @@ namespace session {
/** use filter predicate provided by the concrete query */ /** use filter predicate provided by the concrete query */
template<typename QUERY> template<typename QUERY>
ContentFilter ContentFilter
getContentFilter (QUERY query) getContentFilter (QUERY const& query)
{ {
return query.contentFilter(); return query.contentFilter();
} }
/** especially queries for MObjects need not be filtered */ /** especially queries for MObjects need not be filtered */
ContentFilter ContentFilter
getContentFilter (ScopeQuery<MObject>) getContentFilter (ScopeQuery<MObject> const&)
{ {
static ContentFilter acceptAllObjects = bind (&acceptAllObjects_, _1); static ContentFilter acceptAllObjects = bind (&acceptAllObjects_, _1);
return acceptAllObjects; return acceptAllObjects;
@ -342,7 +342,7 @@ namespace session {
ScopeQuery<MO> const& query = static_cast<ScopeQuery<MO> const&> (goal); ScopeQuery<MO> const& query = static_cast<ScopeQuery<MO> const&> (goal);
ScopeQueryKind direction = query.searchDirection(); ScopeQueryKind direction = query.searchDirection();
PID scopeID = query.searchScope().getID(); ///////////////////////////////TICKET #411 PID scopeID = query.searchScope();
return new ResultSet( bind (&PlacementIndexQueryResolver::setupExploration, return new ResultSet( bind (&PlacementIndexQueryResolver::setupExploration,
this, scopeID, direction) this, scopeID, direction)

4
src/proc/mobject/session/scope-query.hpp
View file

@ -116,7 +116,7 @@ namespace session {
QueryResolver const& index_; QueryResolver const& index_;
PlacementMO const& startPoint_; PlacementMO::ID startPoint_;
ScopeQueryKind to_discover_; ScopeQueryKind to_discover_;
public: public:
@ -142,7 +142,7 @@ namespace session {
return _Query::resolveBy (index_); return _Query::resolveBy (index_);
} }
PlacementMO const& PlacementMO::ID const&
searchScope () const searchScope () const
{ {
return startPoint_; return startPoint_;