comparison OrthancServer/Sources/ResourceFinder.cpp @ 5699:e8e028aed89f find-refactoring

c-find tests pass using ResourceFinder
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 12 Jul 2024 14:08:31 +0200
parents f375e9983943
children 388aef262b1b
comparison
equal deleted inserted replaced
5698:075558c95cbb 5699:e8e028aed89f
718 requestedTagsFromFileStorage_.insert(tag); 718 requestedTagsFromFileStorage_.insert(tag);
719 request_.SetRetrieveOneInstanceIdentifier(true); 719 request_.SetRetrieveOneInstanceIdentifier(true);
720 } 720 }
721 else 721 else
722 { 722 {
723 // Main DICOM tags from the instance level will be retrieved anyway 723 request_.SetRetrieveMainDicomTags(true);
724 assert(request_.IsRetrieveMainDicomTags()); 724 request_.SetRetrieveMetadata(true);
725 assert(request_.IsRetrieveMetadata());
726 requestedInstanceTags_.insert(tag); 725 requestedInstanceTags_.insert(tag);
727 } 726 }
728 727
729 hasRequestedTags_ = true; 728 hasRequestedTags_ = true;
730 } 729 }
832 if (lock.GetConfiguration().IsWarningEnabled(Warnings_001_TagsBeingReadFromStorage)) 831 if (lock.GetConfiguration().IsWarningEnabled(Warnings_001_TagsBeingReadFromStorage))
833 { 832 {
834 std::string missings; 833 std::string missings;
835 FromDcmtkBridge::FormatListOfTags(missings, missingTags); 834 FromDcmtkBridge::FormatListOfTags(missings, missingTags);
836 835
837 LOG(WARNING) << "W001: Accessing Dicom tags from storage when accessing " 836 LOG(WARNING) << "W001: Accessing DICOM tags from storage when accessing "
838 << Orthanc::GetResourceTypeText(resource.GetLevel(), false, false) 837 << Orthanc::GetResourceTypeText(resource.GetLevel(), false, false)
839 << ": " << missings; 838 << ": " << missings;
840 } 839 }
841 840
842 std::string instancePublicId; 841 std::string instancePublicId;