comparison OrthancServer/Sources/ResourceFinder.cpp @ 5701:388aef262b1b find-refactoring

reduce the number of metadata retrievals
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 12 Jul 2024 15:08:43 +0200
parents e8e028aed89f
children 359a8adb3802
comparison
equal deleted inserted replaced
5700:1fab9ddaf702 5701:388aef262b1b
623 if (DicomMap::IsMainDicomTag(tag, ResourceType_Patient)) 623 if (DicomMap::IsMainDicomTag(tag, ResourceType_Patient))
624 { 624 {
625 if (request_.GetLevel() == ResourceType_Patient) 625 if (request_.GetLevel() == ResourceType_Patient)
626 { 626 {
627 request_.SetRetrieveMainDicomTags(true); 627 request_.SetRetrieveMainDicomTags(true);
628 request_.SetRetrieveMetadata(true);
629 requestedPatientTags_.insert(tag); 628 requestedPatientTags_.insert(tag);
630 } 629 }
631 else 630 else
632 { 631 {
633 /** 632 /**
637 requestedStudyTags_.insert(tag); 636 requestedStudyTags_.insert(tag);
638 637
639 if (request_.GetLevel() == ResourceType_Study) 638 if (request_.GetLevel() == ResourceType_Study)
640 { 639 {
641 request_.SetRetrieveMainDicomTags(true); 640 request_.SetRetrieveMainDicomTags(true);
642 request_.SetRetrieveMetadata(true);
643 } 641 }
644 else 642 else
645 { 643 {
646 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMainDicomTags(true); 644 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMainDicomTags(true);
647 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMetadata(true);
648 } 645 }
649 646
650 requestedStudyTags_.insert(tag); 647 requestedStudyTags_.insert(tag);
651 } 648 }
652 649
664 else 661 else
665 { 662 {
666 if (request_.GetLevel() == ResourceType_Study) 663 if (request_.GetLevel() == ResourceType_Study)
667 { 664 {
668 request_.SetRetrieveMainDicomTags(true); 665 request_.SetRetrieveMainDicomTags(true);
669 request_.SetRetrieveMetadata(true);
670 } 666 }
671 else 667 else
672 { 668 {
673 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMainDicomTags(true); 669 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMainDicomTags(true);
674 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMetadata(true);
675 } 670 }
676 671
677 requestedStudyTags_.insert(tag); 672 requestedStudyTags_.insert(tag);
678 } 673 }
679 674
692 else 687 else
693 { 688 {
694 if (request_.GetLevel() == ResourceType_Series) 689 if (request_.GetLevel() == ResourceType_Series)
695 { 690 {
696 request_.SetRetrieveMainDicomTags(true); 691 request_.SetRetrieveMainDicomTags(true);
697 request_.SetRetrieveMetadata(true);
698 } 692 }
699 else 693 else
700 { 694 {
701 request_.GetParentSpecification(ResourceType_Series).SetRetrieveMainDicomTags(true); 695 request_.GetParentSpecification(ResourceType_Series).SetRetrieveMainDicomTags(true);
702 request_.GetParentSpecification(ResourceType_Series).SetRetrieveMetadata(true);
703 } 696 }
704 697
705 requestedSeriesTags_.insert(tag); 698 requestedSeriesTags_.insert(tag);
706 } 699 }
707 700
719 request_.SetRetrieveOneInstanceIdentifier(true); 712 request_.SetRetrieveOneInstanceIdentifier(true);
720 } 713 }
721 else 714 else
722 { 715 {
723 request_.SetRetrieveMainDicomTags(true); 716 request_.SetRetrieveMainDicomTags(true);
724 request_.SetRetrieveMetadata(true);
725 requestedInstanceTags_.insert(tag); 717 requestedInstanceTags_.insert(tag);
726 } 718 }
727 719
728 hasRequestedTags_ = true; 720 hasRequestedTags_ = true;
729 } 721 }