comparison 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
comparison
equal deleted inserted replaced
5679:527918e9c5d9 5681:77875b51cf95
562 } 562 }
563 563
564 564
565 virtual void ApplyLookupResources(std::list<std::string>& resourcesId, 565 virtual void ApplyLookupResources(std::list<std::string>& resourcesId,
566 std::list<std::string>* instancesId, 566 std::list<std::string>* instancesId,
567 const std::vector<DatabaseConstraint>& lookup, 567 const DatabaseConstraints& lookup,
568 ResourceType queryLevel, 568 ResourceType queryLevel,
569 const std::set<std::string>& labels, 569 const std::set<std::string>& labels,
570 LabelsConstraint labelsConstraint, 570 LabelsConstraint labelsConstraint,
571 uint32_t limit) ORTHANC_OVERRIDE 571 uint32_t limit) ORTHANC_OVERRIDE
572 { 572 {
584 else 584 else
585 { 585 {
586 std::vector<OrthancPluginDatabaseConstraint> constraints; 586 std::vector<OrthancPluginDatabaseConstraint> constraints;
587 std::vector< std::vector<const char*> > constraintsValues; 587 std::vector< std::vector<const char*> > constraintsValues;
588 588
589 constraints.resize(lookup.size()); 589 constraints.resize(lookup.GetSize());
590 constraintsValues.resize(lookup.size()); 590 constraintsValues.resize(lookup.GetSize());
591 591
592 for (size_t i = 0; i < lookup.size(); i++) 592 for (size_t i = 0; i < lookup.GetSize(); i++)
593 { 593 {
594 lookup[i].EncodeForPlugins(constraints[i], constraintsValues[i]); 594 lookup.GetConstraint(i).EncodeForPlugins(constraints[i], constraintsValues[i]);
595 } 595 }
596 596
597 ResetAnswers(); 597 ResetAnswers();
598 answerMatchingResources_ = &resourcesId; 598 answerMatchingResources_ = &resourcesId;
599 answerMatchingInstances_ = instancesId; 599 answerMatchingInstances_ = instancesId;
600 600
601 CheckSuccess(that_.extensions_.lookupResources(that_.GetContext(), that_.payload_, lookup.size(), 601 CheckSuccess(that_.extensions_.lookupResources(that_.GetContext(), that_.payload_, lookup.GetSize(),
602 (lookup.empty() ? NULL : &constraints[0]), 602 (lookup.IsEmpty() ? NULL : &constraints[0]),
603 Plugins::Convert(queryLevel), 603 Plugins::Convert(queryLevel),
604 limit, (instancesId == NULL ? 0 : 1))); 604 limit, (instancesId == NULL ? 0 : 1)));
605 } 605 }
606 } 606 }
607 607