# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1525805329 -7200
# Node ID a84ce82fd55b4fd17d3051e058062fcf7fe96c9b
# Parent  b2f57399b067ac4e55b07e3028c579790570d6d5
Fix generation of DICOMDIR if PatientID is empty

diff -r b2f57399b067 -r a84ce82fd55b Core/DicomParsing/DicomDirWriter.cpp
--- 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;
     }
 
diff -r b2f57399b067 -r a84ce82fd55b NEWS
--- 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)
 ==========================