Mercurial > hg > orthanc
diff OrthancServer/Sources/ServerContext.cpp @ 5684:9b3816c21008 find-refactoring
integration mainline->find-refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 09 Jul 2024 11:39:07 +0200 |
parents | fd4c5e064cbe 0c218d90096e |
children | f0f7d15d195e |
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerContext.cpp Tue Jul 09 11:17:34 2024 +0200 +++ b/OrthancServer/Sources/ServerContext.cpp Tue Jul 09 11:39:07 2024 +0200 @@ -1534,6 +1534,8 @@ void ServerContext::Apply(ILookupVisitor& visitor, const DatabaseLookup& lookup, ResourceType queryLevel, + const std::set<std::string>& labels, + LabelsConstraint labelsConstraint, size_t since, size_t limit) { @@ -1566,8 +1568,8 @@ ResourceFinder finder(queryLevel, false /* TODO-FIND: don't expand for now */); finder.SetLimits(0, lookupLimit); finder.SetDatabaseLookup(*fastLookup); - finder.SetLabels(lookup.GetLabels()); - finder.SetLabelsConstraint(lookup.GetLabelsConstraint()); + finder.SetLabels(labels); + finder.SetLabelsConstraint(labelsConstraint); if (queryLevel != ResourceType_Instance) { @@ -1601,8 +1603,7 @@ * VERSION IN ORTHANC <= 1.12.4 **/ - GetIndex().ApplyLookupResources(resources, &instances, *fastLookup, queryLevel, - lookup.GetLabels(), lookup.GetLabelsConstraint(), lookupLimit); + GetIndex().ApplyLookupResources(resources, &instances, *fastLookup, queryLevel, labels, labelsConstraint, lookupLimit); } bool complete = (databaseLimit == 0 ||