# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1525881386 -7200
# Node ID 84cbc5abf3cc156278bdac70c94d9c914a5bd44f
# Parent  3372c52553331d67e80bb0d47392c68d41b620e8# Parent  fcf447be9e97b4b43487a7e1f9a5d7773504ff87
merge

diff -r 3372c5255333 -r 84cbc5abf3cc Core/DicomParsing/DicomDirWriter.cpp
--- a/Core/DicomParsing/DicomDirWriter.cpp	Wed May 09 17:56:14 2018 +0200
+++ b/Core/DicomParsing/DicomDirWriter.cpp	Wed May 09 17:56:26 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 3372c5255333 -r 84cbc5abf3cc NEWS
--- a/NEWS	Wed May 09 17:56:14 2018 +0200
+++ b/NEWS	Wed May 09 17:56:26 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)
 ==========================
 
diff -r 3372c5255333 -r 84cbc5abf3cc OrthancServer/main.cpp
--- a/OrthancServer/main.cpp	Wed May 09 17:56:14 2018 +0200
+++ b/OrthancServer/main.cpp	Wed May 09 17:56:26 2018 +0200
@@ -793,7 +793,9 @@
   }
 
   httpServer.Start();
-  LOG(WARNING) << "HTTP server listening on port: " << httpServer.GetPortNumber();
+  LOG(WARNING) << "HTTP server listening on port: " << httpServer.GetPortNumber()
+               << " (HTTPS encryption is "
+               << (httpServer.IsSslEnabled() ? "enabled" : "disabled") << ")";
   
   bool restart = WaitForExit(context, restApi);
 
diff -r 3372c5255333 -r 84cbc5abf3cc README
--- a/README	Wed May 09 17:56:14 2018 +0200
+++ b/README	Wed May 09 17:56:26 2018 +0200
@@ -47,16 +47,16 @@
 use of Orthanc to warn us about this use. You can cite our work
 using the following BibTeX entry:
 
-@inproceedings{Jodogne:ISBI2013,
-  author = {Jodogne, S. and Bernard, C. and Devillers, M. and Lenaerts, E. and Coucke, P.},
-  title = {Orthanc -- {A} Lightweight, {REST}ful {DICOM} Server for Healthcare and Medical Research},
-  booktitle={Biomedical Imaging ({ISBI}), {IEEE} 10th International Symposium on}, 
-  year={2013}, 
-  pages={190-193}, 
-  ISSN={1945-7928},
-  month=apr,
-  url={http://ieeexplore.ieee.org/xpl/articleDetails.jsp?tp=&arnumber=6556444},
-  address={San Francisco, {CA}, {USA}}
+@Article{Jodogne2018,
+  author="Jodogne, S{\'e}bastien",
+  title="The {O}rthanc Ecosystem for Medical Imaging",
+  journal="Journal of Digital Imaging",
+  year="2018",
+  month="May",
+  day="03",
+  issn="1618-727X",
+  doi="10.1007/s10278-018-0082-y",
+  url="https://doi.org/10.1007/s10278-018-0082-y"
 }