Mercurial > hg > orthanc
comparison OrthancServer/Search/HierarchicalMatcher.cpp @ 1929:cda5b0ab4ce5
ORTHANC_MAXIMUM_TAG_LENGTH made explicit
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 21 Mar 2016 14:28:59 +0100 |
parents | b1291df2f780 |
children | 6301bbcbcaed |
comparison
equal
deleted
inserted
replaced
1928:84c7eaeb5244 | 1929:cda5b0ab4ce5 |
---|---|
120 } | 120 } |
121 } | 121 } |
122 else | 122 else |
123 { | 123 { |
124 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement | 124 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement |
125 (*element, DicomToJsonFlags_None, encoding)); | 125 (*element, DicomToJsonFlags_None, |
126 ORTHANC_MAXIMUM_TAG_LENGTH, encoding)); | |
126 | 127 |
127 if (value->IsBinary()) | 128 if (value->IsBinary()) |
128 { | 129 { |
129 if (!value->GetContent().empty()) | 130 if (!value->GetContent().empty()) |
130 { | 131 { |
219 { | 220 { |
220 return false; | 221 return false; |
221 } | 222 } |
222 | 223 |
223 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement | 224 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement |
224 (*element, DicomToJsonFlags_None, encoding)); | 225 (*element, DicomToJsonFlags_None, |
226 ORTHANC_MAXIMUM_TAG_LENGTH, encoding)); | |
225 | 227 |
226 if (value->IsNull() || | 228 if (value->IsNull() || |
227 value->IsBinary() || | 229 value->IsBinary() || |
228 !it->second->Match(value->GetContent())) | 230 !it->second->Match(value->GetContent())) |
229 { | 231 { |