comparison OrthancServer/Search/HierarchicalMatcher.cpp @ 2409:e4045b3c9772

ignore-length argument if retrieving DICOM tags
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 27 Sep 2017 17:36:13 +0200
parents 7284093111b0
children 878b59270859
comparison
equal deleted inserted replaced
2408:26a0cc24d48d 2409:e4045b3c9772
120 throw OrthancException(ErrorCode_BadRequest); 120 throw OrthancException(ErrorCode_BadRequest);
121 } 121 }
122 } 122 }
123 else 123 else
124 { 124 {
125 std::set<DicomTag> ignoreTagLength;
125 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement 126 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement
126 (*element, DicomToJsonFlags_None, 127 (*element, DicomToJsonFlags_None,
127 ORTHANC_MAXIMUM_TAG_LENGTH, encoding)); 128 ORTHANC_MAXIMUM_TAG_LENGTH, encoding, ignoreTagLength));
128 129
129 if (value->IsBinary()) 130 if (value->IsBinary())
130 { 131 {
131 if (!value->GetContent().empty()) 132 if (!value->GetContent().empty())
132 { 133 {
220 element == NULL) 221 element == NULL)
221 { 222 {
222 return false; 223 return false;
223 } 224 }
224 225
226 std::set<DicomTag> ignoreTagLength;
225 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement 227 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement
226 (*element, DicomToJsonFlags_None, 228 (*element, DicomToJsonFlags_None,
227 ORTHANC_MAXIMUM_TAG_LENGTH, encoding)); 229 ORTHANC_MAXIMUM_TAG_LENGTH, encoding, ignoreTagLength));
228 230
229 if (value->IsNull() || 231 if (value->IsNull() ||
230 value->IsBinary() || 232 value->IsBinary() ||
231 !it->second->Match(value->GetContent())) 233 !it->second->Match(value->GetContent()))
232 { 234 {