Mercurial > hg > orthanc

changeset 2571:a84ce82fd55b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix generation of DICOMDIR if PatientID is empty
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 08 May 2018 20:48:49 +0200
parents b2f57399b067
children fcf447be9e97
files Core/DicomParsing/DicomDirWriter.cpp NEWS
diffstat 2 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Core/DicomParsing/DicomDirWriter.cpp	Fri May 04 10:31:27 2018 +0200
+++ b/Core/DicomParsing/DicomDirWriter.cpp	Tue May 08 20:48:49 2018 +0200
@@ -164,20 +164,23 @@
                                 const DcmTagKey& key)
     {
       DcmElement* element = NULL;
+      result.clear();
 
       if (source.findAndGetElement(key, element).good())
       {
         char* s = NULL;
         if (element->isLeaf() &&
-            element->getString(s).good() &&
-            s != NULL)
+            element->getString(s).good())
         {
-          result = Toolbox::ConvertToUtf8(s, encoding);
+          if (s != NULL)
+          {
+            result = Toolbox::ConvertToUtf8(s, encoding);
+          }
+          
           return true;
         }
       }
 
-      result.clear();
       return false;
     }
 
--- a/NEWS	Fri May 04 10:31:27 2018 +0200
+++ b/NEWS	Tue May 08 20:48:49 2018 +0200
@@ -3,12 +3,19 @@
 
 REST API
 --------
+
 * ".../tags" URI was returning only the first value of DicomTags containing 
   multiple numerical value.  It now returns all values in a string separated
   by \\ (i.e.: "1\\2\\3").  Note that, for data already in Orthanc, you'll need
   to reconstruct the data by sending a POST request to the ".../reconstruct" URI.
   This change triggered an update of ORTHANC_API_VERSION from 1.0 to 1.1
 
+Maintenance
+-----------
+
+* Fix generation of DICOMDIR if PatientID is empty
+
+
 Version 1.3.2 (2018-04-18)
 ==========================