comparison OrthancServer/Sources/Database/Compatibility/GenericFind.cpp @ 5590:8b32213af23e find-refactoring

replaced FindRequest::ResponseContent by booleans
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 03 May 2024 18:17:53 +0200
parents b51ee994cd6f
children 1e2631b8b9af
comparison
equal deleted inserted replaced
5589:b51ee994cd6f 5590:8b32213af23e
30 namespace Compatibility 30 namespace Compatibility
31 { 31 {
32 void GenericFind::Execute(FindResponse& response, 32 void GenericFind::Execute(FindResponse& response,
33 const FindRequest& request) 33 const FindRequest& request)
34 { 34 {
35 if (request.GetResponseContent() == FindRequest::ResponseContent_IdentifiersOnly && 35 if (!request.GetOrthancIdentifiers().HasPatientId() &&
36 !request.GetOrthancIdentifiers().HasPatientId() &&
37 !request.GetOrthancIdentifiers().HasStudyId() && 36 !request.GetOrthancIdentifiers().HasStudyId() &&
38 !request.GetOrthancIdentifiers().HasSeriesId() && 37 !request.GetOrthancIdentifiers().HasSeriesId() &&
39 !request.GetOrthancIdentifiers().HasInstanceId() && 38 !request.GetOrthancIdentifiers().HasInstanceId() &&
40 request.GetDicomTagConstraintsCount() == 0 && 39 request.GetDicomTagConstraintsCount() == 0 &&
41 request.GetMetadataConstraintsCount() == 0 && 40 request.GetMetadataConstraintsCount() == 0 &&
74 73
75 for (size_t i = 0; i < response.GetSize(); i++) 74 for (size_t i = 0; i < response.GetSize(); i++)
76 { 75 {
77 const FindResponse::Resource& resource = response.GetResource(i); 76 const FindResponse::Resource& resource = response.GetResource(i);
78 77
79 if (request.HasResponseContent(FindRequest::ResponseContent_MainDicomTags)) 78 if (request.IsRetrieveTagsAtLevel(request.GetLevel()))
80 { 79 {
81 DicomMap tmp; 80 DicomMap tmp;
82 resource.GetDicomTagsAtLevel(tmp, request.GetLevel()); 81 resource.GetDicomTagsAtLevel(tmp, request.GetLevel());
83 if (tmp.GetSize() == 0) 82 if (tmp.GetSize() == 0)
84 { 83 {