diff OrthancServer/DicomFindQuery.cpp @ 1737:ec66a16aa398

removal of DicomStringValue and DicomNullValue
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 22 Oct 2015 07:52:24 +0200
parents 8e23f16a198d
children
line wrap: on
line diff
--- a/OrthancServer/DicomFindQuery.cpp	Wed Oct 21 16:52:23 2015 +0200
+++ b/OrthancServer/DicomFindQuery.cpp	Thu Oct 22 07:52:24 2015 +0200
@@ -349,9 +349,15 @@
     for (std::set<DicomTag>::const_iterator
            it = tags.begin(); it != tags.end(); ++it)
     {
+      const DicomValue& value = mainTags.GetValue(*it);
+      if (value.IsBinary() || value.IsNull())
+      {
+        return false;
+      }
+
       Constraints::const_iterator constraint = constraints_.find(*it);
       if (constraint != constraints_.end() &&
-          !constraint->second->Apply(mainTags.GetValue(*it).AsString()))
+          !constraint->second->Apply(value.GetContent()))
       {
         return false;
       }