Mercurial > hg > orthanc

diff OrthancServer/Search/HierarchicalMatcher.cpp @ 1874:950745f3f48b dcmtk-3.6.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->dcmtk-3.6.1
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 07 Dec 2015 10:39:23 +0100
parents 769178f0ab2c
children 74dc6b764ff0
line wrap: on
line diff
--- a/OrthancServer/Search/HierarchicalMatcher.cpp	Wed Dec 02 10:05:45 2015 +0100
+++ b/OrthancServer/Search/HierarchicalMatcher.cpp	Mon Dec 07 10:39:23 2015 +0100
@@ -123,12 +123,12 @@
         std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement
                                         (*element, DicomToJsonFlags_None, encoding));
 
-        if (value->IsBinary() ||
-            value->IsNull())
+        if (value->IsBinary())
         {
           throw OrthancException(ErrorCode_BadRequest);
         }
-        else if (value->GetContent().empty())
+        else if (value->IsNull() ||
+                 value->GetContent().empty())
         {
           // This is an universal matcher
           constraints_[tag] = NULL;