Mercurial > hg > orthanc

changeset 4723:4b721432fa67 openssl-3.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->openssl-3.x
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 24 Jun 2021 12:50:01 +0200
parents b11900508dc0 (current diff) 2b4da0ee6b73 (diff)
children 8cc9137b5c2e
files NEWS OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp TODO
diffstat 3 files changed, 16 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Wed Jun 23 19:00:22 2021 +0200
+++ b/NEWS	Thu Jun 24 12:50:01 2021 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.9.4 (2021-06-24)
+==========================
+
 General
 -------
 
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Jun 23 19:00:22 2021 +0200
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Thu Jun 24 12:50:01 2021 +0200
@@ -130,6 +130,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "3ea66c09f64aca990016683b6375734e")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.3")
         set(ORTHANC_FRAMEWORK_MD5 "9b86e6f00e03278293cd15643cc0233f")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.4")
+        set(ORTHANC_FRAMEWORK_MD5 "6d5ca4a73ac7d42445041ca79de1624d")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp	Wed Jun 23 19:00:22 2021 +0200
+++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp	Thu Jun 24 12:50:01 2021 +0200
@@ -54,6 +54,8 @@
 
 static const std::string CHECK_REVISIONS = "CheckRevisions";
 
+static const char* const IGNORE_LENGTH = "ignore-length";
+
 
 namespace Orthanc
 {
@@ -400,7 +402,7 @@
     std::string publicId = call.GetUriComponent("id", "");
 
     std::set<DicomTag> ignoreTagLength;
-    ParseSetOfTags(ignoreTagLength, call, "ignore-length");
+    ParseSetOfTags(ignoreTagLength, call, IGNORE_LENGTH);
     
     if (format != DicomToJsonFormat_Full ||
         !ignoreTagLength.empty())
@@ -432,6 +434,8 @@
         .SetDescription("Get the DICOM tags in the specified format. By default, the `full` format is used, which "
                         "combines hexadecimal tags with human-readable description.")
         .SetUriArgument("id", "Orthanc identifier of the DICOM instance of interest")
+        .SetHttpGetArgument(IGNORE_LENGTH, RestApiCallDocumentation::Type_JsonListOfStrings,
+                            "Also include the DICOM tags that are provided in this list, even if their associated value is long", false)
         .AddAnswerType(MimeType_Json, "JSON object containing the DICOM tags and their associated value")
         .SetTruncatedJsonHttpGetSample("https://demo.orthanc-server.com/instances/7c92ce8e-bbf67ed2-ffa3b8c1-a3b35d94-7ff3ae26/tags", 10);
       return;
@@ -466,7 +470,7 @@
         .SetSummary("Get human-readable tags")
         .SetDescription("Get the DICOM tags in human-readable format (same as the `/instances/{id}/tags?simplify` route)")
         .SetUriArgument("id", "Orthanc identifier of the DICOM instance of interest")
-        .SetHttpGetArgument("ignore-length", RestApiCallDocumentation::Type_JsonListOfStrings,
+        .SetHttpGetArgument(IGNORE_LENGTH, RestApiCallDocumentation::Type_JsonListOfStrings,
                             "Also include the DICOM tags that are provided in this list, even if their associated value is long", false)
         .AddAnswerType(MimeType_Json, "JSON object containing the DICOM tags and their associated value")
         .SetTruncatedJsonHttpGetSample("https://demo.orthanc-server.com/instances/7c92ce8e-bbf67ed2-ffa3b8c1-a3b35d94-7ff3ae26/simplified-tags", 10);
@@ -2396,7 +2400,7 @@
         .SetSummary("Get " + m + " module" + std::string(resource == m ? "" : " of " + resource))
         .SetDescription("Get the " + m + " module of the DICOM " + resource + " whose Orthanc identifier is provided in the URL")
         .SetUriArgument("id", "Orthanc identifier of the " + resource + " of interest")
-        .SetHttpGetArgument("ignore-length", RestApiCallDocumentation::Type_JsonListOfStrings,
+        .SetHttpGetArgument(IGNORE_LENGTH, RestApiCallDocumentation::Type_JsonListOfStrings,
                             "Also include the DICOM tags that are provided in this list, even if their associated value is long", false)
         .AddAnswerType(MimeType_Json, "Information about the DICOM " + resource)
         .SetHttpGetSample(GetDocumentationSampleResource(resourceType) + "/" + (*call.GetFullUri().rbegin()), true);
@@ -2417,7 +2421,7 @@
     std::string publicId = call.GetUriComponent("id", "");
 
     std::set<DicomTag> ignoreTagLength;
-    ParseSetOfTags(ignoreTagLength, call, "ignore-length");
+    ParseSetOfTags(ignoreTagLength, call, IGNORE_LENGTH);
 
     typedef std::set<DicomTag> ModuleTags;
     ModuleTags moduleTags;
@@ -2793,7 +2797,7 @@
         .SetDescription("Get the tags of all the child instances of the DICOM " + r +
                         " whose Orthanc identifier is provided in the URL")
         .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
-        .SetHttpGetArgument("ignore-length", RestApiCallDocumentation::Type_JsonListOfStrings,
+        .SetHttpGetArgument(IGNORE_LENGTH, RestApiCallDocumentation::Type_JsonListOfStrings,
                             "Also include the DICOM tags that are provided in this list, even if their associated value is long", false)
         .AddAnswerType(MimeType_Json, "JSON object associating the Orthanc identifiers of the instances, with the values of their DICOM tags")
         .SetTruncatedJsonHttpGetSample(GetDocumentationSampleResource(t) + "/instances-tags", 5);
@@ -2805,7 +2809,7 @@
     DicomToJsonFormat format = OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Full);
 
     std::set<DicomTag> ignoreTagLength;
-    ParseSetOfTags(ignoreTagLength, call, "ignore-length");
+    ParseSetOfTags(ignoreTagLength, call, IGNORE_LENGTH);
 
     // Retrieve all the instances of this patient/study/series
     typedef std::list<std::string> Instances;