Mercurial > hg > orthanc
changeset 3718:922c56b76edc storage-commitment
integration mainline->storage-commitment
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 04 Mar 2020 16:03:40 +0100 |
| parents | 0504cc83486a (current diff) 914f783ef085 (diff) |
| children | e7ff4f9b34bd |
| files | Resources/Configuration.json |
| diffstat | 3 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/WebServiceParameters.cpp Mon Mar 02 18:12:40 2020 +0100 +++ b/Core/WebServiceParameters.cpp Wed Mar 04 16:03:40 2020 +0100 @@ -304,7 +304,8 @@ break; default: - throw OrthancException(ErrorCode_BadFileFormat); + throw OrthancException(ErrorCode_BadFileFormat, + "User-defined properties associated with a Web service must be strings: " + *it); } } }
--- a/Resources/Configuration.json Mon Mar 02 18:12:40 2020 +0100 +++ b/Resources/Configuration.json Wed Mar 04 16:03:40 2020 +0100 @@ -217,6 +217,7 @@ // "AET" : "ORTHANC", // "Port" : 104, // "Host" : "127.0.0.1", + // "Manufacturer" : "Generic", // "AllowEcho" : false, // "AllowFind" : false, // "AllowMove" : false,
--- a/Resources/DownloadOrthancFramework.cmake Mon Mar 02 18:12:40 2020 +0100 +++ b/Resources/DownloadOrthancFramework.cmake Wed Mar 04 16:03:40 2020 +0100 @@ -112,6 +112,17 @@ set(ORTHANC_FRAMEWORK_MD5 "e1b76f01116d9b5d4ac8cc39980560e3") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.8") set(ORTHANC_FRAMEWORK_MD5 "82323e8c49a667f658a3639ea4dbc336") + + # Below this point are development snapshots that were used to + # release some plugin, before an official release of the Orthanc + # framework was available. Here is the command to be used to + # generate a proper archive: + # + # $ hg archive /tmp/Orthanc-`hg id -i | sed 's/\+//'`.tar.gz + # + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df") + # DICOMweb 1.1 (framework pre-1.6.0) + set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645") endif() endif() endif()