Mercurial > hg > orthanc

comparison OrthancServer/Sources/ResourceFinder.cpp @ 5752:717acb0ea546 find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix DICOMWeb integration tests
author Alain Mazy <am@orthanc.team>
date Tue, 03 Sep 2024 16:37:31 +0200
parents 2b05428843d2
children db4bd2f9e8d2
comparison
equal deleted inserted replaced
5751:5d78e5cafabc 5752:717acb0ea546
756 } 756 }
757 else if (tag == DICOM_TAG_MODALITIES_IN_STUDY) 757 else if (tag == DICOM_TAG_MODALITIES_IN_STUDY)
758 { 758 {
759 requestedComputedTags_.insert(tag); 759 requestedComputedTags_.insert(tag);
760 hasRequestedTags_ = true; 760 hasRequestedTags_ = true;
761 request_.GetChildrenSpecification(ResourceType_Series).AddMainDicomTag(DICOM_TAG_MODALITY); 761 if (request_.GetLevel() < ResourceType_Series)
762 {
763 request_.GetChildrenSpecification(ResourceType_Series).AddMainDicomTag(DICOM_TAG_MODALITY);
764 }
765 else if (request_.GetLevel() == ResourceType_Instance) // this happens in QIDO-RS when searching for instances without specifying a StudyInstanceUID -> all Study level tags must be included in the response
766 {
767 request_.GetParentSpecification(ResourceType_Series).SetRetrieveMainDicomTags(true);
768 }
762 } 769 }
763 else if (tag == DICOM_TAG_INSTANCE_AVAILABILITY) 770 else if (tag == DICOM_TAG_INSTANCE_AVAILABILITY)
764 { 771 {
765 requestedComputedTags_.insert(tag); 772 requestedComputedTags_.insert(tag);
766 hasRequestedTags_ = true; 773 hasRequestedTags_ = true;