Commit cf3958ca authored by Sebastien Jodogne's avatar Sebastien Jodogne
Browse files

New upstream version 1.5.6+dfsg

parent 6e40958b

.hg_archival.txt

+4 −4
Original line number Diff line number Diff line 
repo: 3959d33612ccaadc0d4d707227fbed09ac35e5fe

node: 010d5e6edabed784325c43ce81ec140a6a9ccf84

branch: Orthanc-1.5.5

node: 56d7f3d50c89c6c66c9932621a1ae05403e34ee1

branch: Orthanc-1.5.6

latesttag: dcmtk-3.6.1

latesttagdistance: 806

changessincelatesttag: 923
 
latesttagdistance: 817

changessincelatesttag: 934

Core/DicomParsing/DicomWebJsonVisitor.cpp

+15 −6
Original line number Diff line number Diff line
@@ -323,6 +323,8 @@ namespace Orthanc 


    

  Json::Value DicomWebJsonVisitor::FormatDouble(double value)

  {

    try

    {

      long long a = boost::math::llround<double>(value);
@@ -337,6 +339,13 @@ namespace Orthanc 
        return Json::Value(value);

      }

    }

    catch (boost::math::rounding_error&)

    {

      // Can occur if "long long" is too small to receive this value

      // (e.g. infinity)

      return Json::Value(value);

    }

  }





#if ORTHANC_ENABLE_PUGIXML == 1

Core/RestApi/RestApiOutput.cpp

+23 −3
Original line number Diff line number Diff line
@@ -128,10 +128,30 @@ namespace Orthanc 
                                   MimeType contentType)

  {

    CheckStatus();



    if (convertJsonToXml_ &&

        contentType == MimeType_Json)

    {

      Json::Value json;

      Json::Reader reader;

      if (reader.parse(reinterpret_cast<const char*>(buffer),

                       reinterpret_cast<const char*>(buffer) + length, json))

      {

        AnswerJson(json);

      }

      else

      {

        throw OrthancException(ErrorCode_BadFileFormat,

                               "The REST API tries and answers with an invalid JSON file");

      } 

    }

    else

    {

      output_.SetContentType(contentType);

      output_.Answer(buffer, length);

      alreadySent_ = true;

    }

  }



  void RestApiOutput::Redirect(const std::string& path)

  {

NEWS

+19 −0
Original line number Diff line number Diff line
@@ -2,6 +2,25 @@ Pending changes in the mainline 
===============================





Version 1.5.6 (2019-03-01)

==========================



Orthanc Explorer

----------------



* If performing a Query/Retrieve operation, the default value for the

  tags is set to an empty string instead of '*', which allows to match

  even if the tag is not present. This allows malformed DICOM files to

  be matched, even though they lack required tags such as "PatientSex"



Maintenance

-----------



* Enlarge the support of JSON-to-XML conversion in the REST API

* Fix missing DB transactions in some write operations

* Fix performance issue in DICOM protocol by disabling Nagle's algorithm





Version 1.5.5 (2019-02-25)

==========================

OrthancExplorer/query-retrieve.js

+5 −5
Original line number Diff line number Diff line
@@ -84,11 +84,11 @@ $('#qr-submit').live('click', function() { 
  query = {

    'Level' : 'Study',

    'Query' : {

      'AccessionNumber' : '*',

      'PatientBirthDate' : '*',

      'PatientID' : '*',

      'PatientName' : '*',

      'PatientSex' : '*',

      'AccessionNumber' : '',

      'PatientBirthDate' : '',

      'PatientID' : '',

      'PatientName' : '',

      'PatientSex' : '',

      'StudyDate' : $('#qr-date').val(),

      'StudyDescription' : '*'

    }