diff OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp @ 5681:77875b51cf95 find-refactoring

integration mainline->find-refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Jul 2024 10:15:15 +0200
parents 3f13db27b399 68fc5af30c03
children 023a99146dd0 7030fa489669
line wrap: on
line diff
--- a/OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp	Tue Jul 09 09:03:40 2024 +0200
+++ b/OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp	Tue Jul 09 10:15:15 2024 +0200
@@ -564,7 +564,7 @@
     
     virtual void ApplyLookupResources(std::list<std::string>& resourcesId,
                                       std::list<std::string>* instancesId,
-                                      const std::vector<DatabaseConstraint>& lookup,
+                                      const DatabaseConstraints& lookup,
                                       ResourceType queryLevel,
                                       const std::set<std::string>& labels,
                                       LabelsConstraint labelsConstraint,
@@ -586,20 +586,20 @@
         std::vector<OrthancPluginDatabaseConstraint> constraints;
         std::vector< std::vector<const char*> > constraintsValues;
 
-        constraints.resize(lookup.size());
-        constraintsValues.resize(lookup.size());
+        constraints.resize(lookup.GetSize());
+        constraintsValues.resize(lookup.GetSize());
 
-        for (size_t i = 0; i < lookup.size(); i++)
+        for (size_t i = 0; i < lookup.GetSize(); i++)
         {
-          lookup[i].EncodeForPlugins(constraints[i], constraintsValues[i]);
+          lookup.GetConstraint(i).EncodeForPlugins(constraints[i], constraintsValues[i]);
         }
 
         ResetAnswers();
         answerMatchingResources_ = &resourcesId;
         answerMatchingInstances_ = instancesId;
       
-        CheckSuccess(that_.extensions_.lookupResources(that_.GetContext(), that_.payload_, lookup.size(),
-                                                       (lookup.empty() ? NULL : &constraints[0]),
+        CheckSuccess(that_.extensions_.lookupResources(that_.GetContext(), that_.payload_, lookup.GetSize(),
+                                                       (lookup.IsEmpty() ? NULL : &constraints[0]),
                                                        Plugins::Convert(queryLevel),
                                                        limit, (instancesId == NULL ? 0 : 1)));
       }