# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1583334220 -3600
# Node ID 922c56b76edc5ea99eae91794652687694a1eb33
# Parent  0504cc83486a686502269af9944e3b09cb26a6b4# Parent  914f783ef0855ce6e374f7a9534d8ff58635b153
integration mainline->storage-commitment

diff -r 0504cc83486a -r 922c56b76edc Core/WebServiceParameters.cpp
--- 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);
         }
       }
     }
diff -r 0504cc83486a -r 922c56b76edc Resources/Configuration.json
--- 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,
diff -r 0504cc83486a -r 922c56b76edc Resources/DownloadOrthancFramework.cmake
--- 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()