# HG changeset patch # User Sebastien Jodogne # Date 1734544085 -3600 # Node ID fd04198d710efed46bf1baa1780e31d60f698ab1 # Parent d2e9b09fa717baac5329641f2a1b34fe46ee2bf7 typos diff -r d2e9b09fa717 -r fd04198d710e NEWS --- a/NEWS Tue Dec 17 13:36:55 2024 +0100 +++ b/NEWS Wed Dec 18 18:48:05 2024 +0100 @@ -290,7 +290,7 @@ * WADO-RS client supports quoted Content-Type header in HTTP answers * Added "Arguments" to WADO-RS and STOW-RS client to handle query arguments in uri * Using MIME types of DICOM version 2017c in WADO RetrieveFrames -* Fix issue #53 (DICOMWeb plugin support for "limit" and "offset" parameters in QIDO-RS) +* Fix issue #53 (DICOMweb plugin support for "limit" and "offset" parameters in QIDO-RS) * Fix issue #28 (Non-compliant enumerations for "accept" header for WADO RetrieveFrames) diff -r d2e9b09fa717 -r fd04198d710e Plugin/Plugin.cpp --- a/Plugin/Plugin.cpp Tue Dec 17 13:36:55 2024 +0100 +++ b/Plugin/Plugin.cpp Wed Dec 18 18:48:05 2024 +0100 @@ -490,7 +490,7 @@ } else { - LOG(WARNING) << "Orthanc does not support ExtendedFind. The DICOMWeb plugin will not benefit from some optimizations."; + LOG(WARNING) << "Orthanc does not support ExtendedFind. The DICOMweb plugin will not benefit from some optimizations."; } bool isReadOnly = system.isMember(READ_ONLY) && system[READ_ONLY].asBool(); @@ -707,7 +707,7 @@ OrthancPlugins::SetRootUri(ORTHANC_DICOM_WEB_NAME, uri.c_str()); std::string publicUrlRoot = OrthancPlugins::Configuration::GetPublicRoot(); - LOG(WARNING) << "DICOMWeb PublicRoot: " << publicUrlRoot; + LOG(WARNING) << "DICOMweb public root: " << publicUrlRoot; } else { diff -r d2e9b09fa717 -r fd04198d710e Plugin/StowRs.cpp --- a/Plugin/StowRs.cpp Tue Dec 17 13:36:55 2024 +0100 +++ b/Plugin/StowRs.cpp Wed Dec 18 18:48:05 2024 +0100 @@ -187,9 +187,9 @@ MemoryBuffer tmp; // make sure to forward the auth headers in the request that is sent to Orthanc (to allow usage of the auth plugin) - // since we do not know which header is being used, we include all the headers from the Stow-RS request (headers_), replace + // since we do not know which header is being used, we include all the headers from the STOW-RS request (headers_), replace // the "content-disposition" + "content-type" that are rebuilt from the multi-part message and remove the headers that might - // be mi-interpreted by Orthanc core (like "content-length" that is actually the "content-length" from the whole Stow-RS request, not the length of this file) + // be mi-interpreted by Orthanc core (like "content-length" that is actually the "content-length" from the whole STOW-RS request, not the length of this file) Orthanc::MultipartStreamReader::HttpHeaders mergedHeaders = headers_; Orthanc::MultipartStreamReader::HttpHeaders::iterator foundContentLength = mergedHeaders.find("content-length"); if (foundContentLength != mergedHeaders.end()) diff -r d2e9b09fa717 -r fd04198d710e Plugin/WadoRsRetrieveFrames.cpp --- a/Plugin/WadoRsRetrieveFrames.cpp Tue Dec 17 13:36:55 2024 +0100 +++ b/Plugin/WadoRsRetrieveFrames.cpp Wed Dec 18 18:48:05 2024 +0100 @@ -503,7 +503,7 @@ std::string currentSyntaxString; if (!OrthancPlugins::RestApiGetString(currentSyntaxString, "/instances/" + orthancId + "/metadata/TransferSyntax", false)) { - throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "DICOMWeb: Unable to get TransferSyntax for instance " + orthancId); + throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "DICOMweb: Unable to get TransferSyntax for instance " + orthancId); } if (!Orthanc::LookupTransferSyntax(currentSyntax, currentSyntaxString)) @@ -518,7 +518,7 @@ // note: these 2 syntaxes are not supposed to be used in retrieve frames // according to https://dicom.nema.org/MEDICAL/dicom/2019a/output/chtml/part18/chapter_6.html#table_6.1.1.8-3b // "The Implicit VR Little Endian (1.2.840.10008.1.2), and Explicit VR Big Endian (1.2.840.10008.1.2.2) transfer syntaxes shall not be used with Web Services." - LOG(INFO) << "The file is in a transfer syntax " << currentSyntaxString << " that is not allowed by the DICOMWeb standard -> it will be transcoded to Little Endian Explicit"; + LOG(INFO) << "The file is in a transfer syntax " << currentSyntaxString << " that is not allowed by the DICOMweb standard -> it will be transcoded to Little Endian Explicit"; targetSyntax = Orthanc::DicomTransferSyntax_LittleEndianExplicit; } @@ -534,7 +534,7 @@ { if (!content.RestApiGet("/instances/" + orthancId + "/file?transcode=" + Orthanc::GetTransferSyntaxUid(targetSyntax), false)) { - throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "DICOMWeb: Unable to get transcoded file for instance " + orthancId); + throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "DICOMweb: Unable to get transcoded file for instance " + orthancId); } // TODO-OPTI: this takes a huge amount of time; e.g: 1.5s for a 600MB file while the DicomInstance usually already exists in the Orthanc core @@ -545,7 +545,7 @@ { if (!content.RestApiGet("/instances/" + orthancId + "/frames/" + boost::lexical_cast(frames.front()) + "/raw", false)) { - throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "DICOMWeb: Unable to get file for instance " + orthancId); + throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "DICOMweb: Unable to get file for instance " + orthancId); } AnswerFrame(output, request, content, studyInstanceUid, seriesInstanceUid, @@ -556,7 +556,7 @@ { if (!content.RestApiGet("/instances/" + orthancId + "/file", false)) { - throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "DICOMWeb: Unable to get file for instance " + orthancId); + throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "DICOMweb: Unable to get file for instance " + orthancId); } instance.reset(new OrthancPlugins::DicomInstance(content.GetData(), content.GetSize())); diff -r d2e9b09fa717 -r fd04198d710e Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Tue Dec 17 13:36:55 2024 +0100 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Wed Dec 18 18:48:05 2024 +0100 @@ -165,6 +165,8 @@ set(ORTHANC_FRAMEWORK_MD5 "975f5bf2142c22cb1777b4f6a0a614c5") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.4") set(ORTHANC_FRAMEWORK_MD5 "1e61779ea4a7cd705720bdcfed8a6a73") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.5") + set(ORTHANC_FRAMEWORK_MD5 "5bb69f092981fdcfc11dec0a0f9a7db3") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc