Mercurial > hg > orthanc
comparison OrthancServer/DicomFindQuery.cpp @ 1744:b3de74dec2d5 db-changes
integration mainline->db-changes
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 26 Oct 2015 12:30:34 +0100 |
parents | ec66a16aa398 |
children |
comparison
equal
deleted
inserted
replaced
1729:54d78925cbb6 | 1744:b3de74dec2d5 |
---|---|
347 mainTags.GetTags(tags); | 347 mainTags.GetTags(tags); |
348 | 348 |
349 for (std::set<DicomTag>::const_iterator | 349 for (std::set<DicomTag>::const_iterator |
350 it = tags.begin(); it != tags.end(); ++it) | 350 it = tags.begin(); it != tags.end(); ++it) |
351 { | 351 { |
352 const DicomValue& value = mainTags.GetValue(*it); | |
353 if (value.IsBinary() || value.IsNull()) | |
354 { | |
355 return false; | |
356 } | |
357 | |
352 Constraints::const_iterator constraint = constraints_.find(*it); | 358 Constraints::const_iterator constraint = constraints_.find(*it); |
353 if (constraint != constraints_.end() && | 359 if (constraint != constraints_.end() && |
354 !constraint->second->Apply(mainTags.GetValue(*it).AsString())) | 360 !constraint->second->Apply(value.GetContent())) |
355 { | 361 { |
356 return false; | 362 return false; |
357 } | 363 } |
358 } | 364 } |
359 | 365 |