Mercurial > hg > orthanc
changeset 2574:84cbc5abf3cc jobs
merge
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 09 May 2018 17:56:26 +0200 |
parents | 3372c5255333 (current diff) fcf447be9e97 (diff) |
children | a874bdbbfa11 |
files | |
diffstat | 4 files changed, 27 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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) ==========================
--- 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);
--- 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" }