comparison OrthancServer/Sources/Database/Compatibility/GenericFind.cpp @ 5582:17da828f9443 find-refactoring

removed FindResponse::Item::level_
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 27 Apr 2024 21:42:32 +0200
parents b0b5546f1b9f
children 74cc31c8db2b
comparison
equal deleted inserted replaced
5581:4ad301c35f6e 5582:17da828f9443
60 for (std::list<std::string>::const_iterator it = ids.begin(); it != ids.end(); ++it) 60 for (std::list<std::string>::const_iterator it = ids.begin(); it != ids.end(); ++it)
61 { 61 {
62 OrthancIdentifiers identifiers; 62 OrthancIdentifiers identifiers;
63 identifiers.SetLevel(request.GetLevel(), *it); 63 identifiers.SetLevel(request.GetLevel(), *it);
64 64
65 response.Add(new FindResponse::Item(request.GetResponseContent(), 65 response.Add(new FindResponse::Item(request.GetResponseContent(), identifiers));
66 request.GetLevel(),
67 identifiers));
68 } 66 }
69 } 67 }
70 else 68 else
71 { 69 {
72 throw OrthancException(ErrorCode_NotImplemented); 70 throw OrthancException(ErrorCode_NotImplemented);
79 77
80 for (size_t i = 0; i < response.GetSize(); i++) 78 for (size_t i = 0; i < response.GetSize(); i++)
81 { 79 {
82 const FindResponse::Item& item = response.GetItem(i); 80 const FindResponse::Item& item = response.GetItem(i);
83 81
84 if (item.GetLevel() != request.GetLevel())
85 {
86 throw OrthancException(ErrorCode_InternalError);
87 }
88
89 if (request.HasResponseContent(FindRequest::ResponseContent_MainDicomTags) 82 if (request.HasResponseContent(FindRequest::ResponseContent_MainDicomTags)
90 && !item.HasDicomMap()) 83 && !item.HasDicomMap())
91 { 84 {
92 throw OrthancException(ErrorCode_InternalError); 85 throw OrthancException(ErrorCode_InternalError);
93 } 86 }