orthanc: OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp annotate

annotate OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 4709:a9a75281cae9 openssl-3.x

fix build on MSVC 2008 32bit

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 22 Jun 2021 10:26:27 +0200
parents	f0038043fb97
children	783f8a048035

rev	line source
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1805 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1279 diff changeset	4 * Department, University Hospital of Liege, Belgium
4437 d9473bd5ed43 upgrade to year 2021 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4435 diff changeset	5 * Copyright (C) 2017-2021 Osimis S.A., Belgium
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * This program is distributed in the hope that it will be useful, but
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * General Public License for more details.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * You should have received a copy of the GNU General Public License
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 **/
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	22 #include "../PrecompiledHeadersServer.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 #include "OrthancRestApi.h"
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	25 #include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	26 #include "../../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	27 #include "../../../OrthancFramework/Sources/SerializationToolbox.h"
3709 1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	28 #include "../OrthancConfiguration.h"
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	29 #include "../ServerContext.h"
2853 52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	30 #include "../ServerJobs/MergeStudyJob.h"
2642 ccc470091ea6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2640 diff changeset	31 #include "../ServerJobs/ResourceModificationJob.h"
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	32 #include "../ServerJobs/SplitStudyJob.h"
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	33
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	34 #include <boost/lexical_cast.hpp>
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	35 #include <boost/algorithm/string/predicate.hpp>
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	36
4687 fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	37 #define INFO_SUBSEQUENCES \
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	38 "Starting with Orthanc 1.9.4, paths to subsequences can be provided using the "\
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	39 "same syntax as the `dcmodify` command-line tool (wildcards are supported as well)."
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	40
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 namespace Orthanc
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 // Modification of DICOM instances ------------------------------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2518 diff changeset	45
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 static std::string GeneratePatientName(ServerContext& context)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	48 uint64_t seq = context.GetIndex().IncrementGlobalSequence(GlobalProperty_AnonymizationSequence, true /* shared */);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 return "Anonymized" + boost::lexical_cast<std::string>(seq);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	53 static void DocumentModifyOptions(RestApiPostCall& call)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	54 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	55 // Check out "DicomModification::ParseModifyRequest()"
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	56 call.GetDocumentation()
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	57 .SetRequestField("Transcode", RestApiCallDocumentation::Type_String,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	58 "Transcode the DICOM instances to the provided DICOM transfer syntax: "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	59 "https://book.orthanc-server.com/faq/transcoding.html", false)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	60 .SetRequestField("Force", RestApiCallDocumentation::Type_Boolean,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	61 "Allow the modification of tags related to DICOM identifiers, at the risk of "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	62 "breaking the DICOM model of the real world", false)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	63 .SetRequestField("RemovePrivateTags", RestApiCallDocumentation::Type_Boolean,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	64 "Remove the private tags from the DICOM instances (defaults to `false`)", false)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	65 .SetRequestField("Replace", RestApiCallDocumentation::Type_JsonObject,
4687 fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	66 "Associative array to change the value of some DICOM tags in the DICOM instances. " INFO_SUBSEQUENCES, false)
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	67 .SetRequestField("Remove", RestApiCallDocumentation::Type_JsonListOfStrings,
4687 fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	68 "List of tags that must be removed from the DICOM instances. " INFO_SUBSEQUENCES, false)
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	69 .SetRequestField("Keep", RestApiCallDocumentation::Type_JsonListOfStrings,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	70 "Keep the original value of the specified tags, to be chosen among the `StudyInstanceUID`, "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	71 "`SeriesInstanceUID` and `SOPInstanceUID` tags. Avoid this feature as much as possible, "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	72 "as this breaks the DICOM model of the real world.", false)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	73 .SetRequestField("PrivateCreator", RestApiCallDocumentation::Type_String,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	74 "The private creator to be used for private tags in `Replace`", false);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	75 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	76
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	77
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	78 static void DocumentAnonymizationOptions(RestApiPostCall& call)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	79 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	80 // Check out "DicomModification::ParseAnonymizationRequest()"
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	81 call.GetDocumentation()
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	82 .SetRequestField("Force", RestApiCallDocumentation::Type_Boolean,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	83 "Allow the modification of tags related to DICOM identifiers, at the risk of "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	84 "breaking the DICOM model of the real world", false)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	85 .SetRequestField("DicomVersion", RestApiCallDocumentation::Type_String,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	86 "Version of the DICOM standard to be used for anonymization. Check out "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	87 "configuration option `DeidentifyLogsDicomVersion` for possible values.", false)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	88 .SetRequestField("KeepPrivateTags", RestApiCallDocumentation::Type_Boolean,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	89 "Keep the private tags from the DICOM instances (defaults to `false`)", false)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	90 .SetRequestField("Replace", RestApiCallDocumentation::Type_JsonObject,
4687 fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	91 "Associative array to change the value of some DICOM tags in the DICOM instances. " INFO_SUBSEQUENCES, false)
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	92 .SetRequestField("Remove", RestApiCallDocumentation::Type_JsonListOfStrings,
4687 fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	93 "List of additional tags to be removed from the DICOM instances. " INFO_SUBSEQUENCES, false)
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	94 .SetRequestField("Keep", RestApiCallDocumentation::Type_JsonListOfStrings,
4687 fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	95 "List of DICOM tags whose value must not be destroyed by the anonymization. " INFO_SUBSEQUENCES, false)
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	96 .SetRequestField("PrivateCreator", RestApiCallDocumentation::Type_String,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	97 "The private creator to be used for private tags in `Replace`", false);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	98 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	99
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	100
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	101 static void ParseModifyRequest(Json::Value& request,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	102 DicomModification& target,
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	103 const RestApiPostCall& call)
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	104 {
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2639 diff changeset	105 // curl http://localhost:8042/series/95a6e2bf-9296e2cc-bf614e2f-22b391ee-16e010e0/modify -X POST -d '{"Replace":{"InstitutionName":"My own clinic"},"Priority":9}'
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	106
3709 1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	107 {
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	108 OrthancConfiguration::ReaderLock lock;
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	109 target.SetPrivateCreator(lock.GetConfiguration().GetDefaultPrivateCreator());
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	110 }
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	111
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	112 if (call.ParseJsonRequest(request))
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	113 {
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2518 diff changeset	114 target.ParseModifyRequest(request);
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	115 }
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	116 else
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	117 {
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	118 throw OrthancException(ErrorCode_BadFileFormat);
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2250 diff changeset	119 }
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	120 }
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2250 diff changeset	121
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	122
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	123 static void ParseAnonymizationRequest(Json::Value& request,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	124 DicomModification& target,
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	125 RestApiPostCall& call)
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	126 {
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	127 // curl http://localhost:8042/instances/6e67da51-d119d6ae-c5667437-87b9a8a5-0f07c49f/anonymize -X POST -d '{"Replace":{"PatientName":"hello","0010-0020":"world"},"Keep":["StudyDescription", "SeriesDescription"],"KeepPrivateTags": true,"Remove":["Modality"]}' > Anonymized.dcm
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	128
3709 1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	129 {
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	130 OrthancConfiguration::ReaderLock lock;
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	131 target.SetPrivateCreator(lock.GetConfiguration().GetDefaultPrivateCreator());
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	132 }
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	133
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	134 if (call.ParseJsonRequest(request) &&
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	135 request.isObject())
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	136 {
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	137 bool patientNameOverridden;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	138 target.ParseAnonymizationRequest(patientNameOverridden, request);
2518 63d2cc0fb40a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2517 diff changeset	139
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	140 if (!patientNameOverridden)
2518 63d2cc0fb40a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2517 diff changeset	141 {
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	142 // Override the random Patient's Name by one that is more
2518 63d2cc0fb40a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2517 diff changeset	143 // user-friendly (provided none was specified by the user)
63d2cc0fb40a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2517 diff changeset	144 target.Replace(DICOM_TAG_PATIENT_NAME, GeneratePatientName(OrthancRestApi::GetContext(call)), true);
63d2cc0fb40a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2517 diff changeset	145 }
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	146 }
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	147 else
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	148 {
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	149 throw OrthancException(ErrorCode_BadFileFormat);
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	150 }
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	151 }
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	152
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	153
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	154 static void AnonymizeOrModifyInstance(DicomModification& modification,
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	155 RestApiPostCall& call,
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	156 bool transcode,
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	157 DicomTransferSyntax targetSyntax)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 {
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	159 ServerContext& context = OrthancRestApi::GetContext(call);
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	160 std::string id = call.GetUriComponent("id", "");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	162 std::unique_ptr<ParsedDicomFile> modified;
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	163
2825 8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	164 {
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	165 ServerContext::DicomCacheLocker locker(context, id);
2825 8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	166 modified.reset(locker.GetDicom().Clone(true));
8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	167 }
8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	168
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	169 modification.Apply(*modified);
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	170
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	171 if (transcode)
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	172 {
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	173 IDicomTranscoder::DicomImage source;
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	174 source.AcquireParsed(*modified); // "modified" is invalid below this point
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	175
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	176 IDicomTranscoder::DicomImage transcoded;
3903 d1273d7cc200 avoid unnecessary dicom serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3901 diff changeset	177
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	178 std::set<DicomTransferSyntax> s;
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	179 s.insert(targetSyntax);
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	180
3951 5fe8c6d3212e removed useless information "hasSopInstanceUidChanged" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3945 diff changeset	181 if (context.Transcode(transcoded, source, s, true))
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	182 {
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	183 call.GetOutput().AnswerBuffer(transcoded.GetBufferData(),
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	184 transcoded.GetBufferSize(), MimeType_Dicom);
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	185 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	186 else
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	187 {
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	188 throw OrthancException(ErrorCode_InternalError,
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	189 "Cannot transcode to transfer syntax: " +
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	190 std::string(GetTransferSyntaxUid(targetSyntax)));
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	191 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	192 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	193 else
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	194 {
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	195 modified->Answer(call.GetOutput());
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	196 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	200 static ResourceType DetectModifyLevel(const DicomModification& modification)
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	201 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	202 if (modification.IsReplaced(DICOM_TAG_PATIENT_ID))
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	203 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	204 return ResourceType_Patient;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	205 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	206 else if (modification.IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	207 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	208 return ResourceType_Study;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	209 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	210 else if (modification.IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	211 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	212 return ResourceType_Series;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	213 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	214 else
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	215 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	216 return ResourceType_Instance;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	217 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	218 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	219
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	220
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	221 static void ModifyInstance(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	223 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	224 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	225 DocumentModifyOptions(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	226 call.GetDocumentation()
4435 23ad1b9c7800 fix tag in openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4424 diff changeset	227 .SetTag("Instances")
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	228 .SetSummary("Modify instance")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	229 .SetDescription("Download a modified version of the DICOM instance whose Orthanc identifier is provided in the URL: "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	230 "https://book.orthanc-server.com/users/anonymization.html#modification-of-a-single-instance")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	231 .SetUriArgument("id", "Orthanc identifier of the instance of interest")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	232 .AddAnswerType(MimeType_Dicom, "The modified DICOM instance");
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	233 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	234 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	235
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	236 DicomModification modification;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	237 modification.SetAllowManualIdentifiers(true);
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	238
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	239 Json::Value request;
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	240 ParseModifyRequest(request, modification, call);
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	241
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	242 modification.SetLevel(DetectModifyLevel(modification));
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	243
3943 b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	244 static const char* TRANSCODE = "Transcode";
b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	245 if (request.isMember(TRANSCODE))
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	246 {
3943 b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	247 std::string s = SerializationToolbox::ReadString(request, TRANSCODE);
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	248
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	249 DicomTransferSyntax syntax;
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	250 if (LookupTransferSyntax(syntax, s))
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	251 {
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	252 AnonymizeOrModifyInstance(modification, call, true, syntax);
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	253 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	254 else
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	255 {
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	256 throw OrthancException(ErrorCode_ParameterOutOfRange, "Unknown transfer syntax: " + s);
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	257 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	258 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	259 else
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	260 {
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	261 AnonymizeOrModifyInstance(modification, call, false /* no transcoding */,
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	262 DicomTransferSyntax_LittleEndianImplicit /* unused */);
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	263 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	267 static void AnonymizeInstance(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	269 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	270 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	271 DocumentAnonymizationOptions(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	272 call.GetDocumentation()
4435 23ad1b9c7800 fix tag in openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4424 diff changeset	273 .SetTag("Instances")
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	274 .SetSummary("Anonymize instance")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	275 .SetDescription("Download an anonymized version of the DICOM instance whose Orthanc identifier is provided in the URL: "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	276 "https://book.orthanc-server.com/users/anonymization.html#anonymization-of-a-single-instance")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	277 .SetUriArgument("id", "Orthanc identifier of the instance of interest")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	278 .AddAnswerType(MimeType_Dicom, "The anonymized DICOM instance");
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	279 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	280 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	281
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	282 DicomModification modification;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	283 modification.SetAllowManualIdentifiers(true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	285 Json::Value request;
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	286 ParseAnonymizationRequest(request, modification, call);
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	287
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	288 AnonymizeOrModifyInstance(modification, call, false /* no transcoding */,
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	289 DicomTransferSyntax_LittleEndianImplicit /* unused */);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	293 static void SetKeepSource(CleaningInstancesJob& job,
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	294 const Json::Value& body)
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	295 {
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	296 static const char* KEEP_SOURCE = "KeepSource";
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	297 if (body.isMember(KEEP_SOURCE))
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	298 {
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	299 job.SetKeepSource(SerializationToolbox::ReadBoolean(body, KEEP_SOURCE));
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	300 }
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	301 }
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	302
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	303
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	304 static void SubmitModificationJob(std::unique_ptr<DicomModification>& modification,
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	305 bool isAnonymization,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	306 RestApiPostCall& call,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	307 const Json::Value& body,
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	308 ResourceType outputLevel /* unused for multiple resources */,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	309 bool isSingleResource,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	310 const std::set<std::string>& resources)
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	311 {
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	312 ServerContext& context = OrthancRestApi::GetContext(call);
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	313
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	314 std::unique_ptr<ResourceModificationJob> job(new ResourceModificationJob(context));
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	315
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	316 if (isSingleResource) // This notably configures the output format
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	317 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	318 job->SetSingleResourceModification(modification.release(), outputLevel, isAnonymization);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	319 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	320 else
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	321 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	322 job->SetMultipleResourcesModification(modification.release(), isAnonymization);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	323 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	324
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	325 job->SetOrigin(call);
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	326 SetKeepSource(*job, body);
3943 b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	327
b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	328 static const char* TRANSCODE = "Transcode";
b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	329 if (body.isMember(TRANSCODE))
b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	330 {
b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	331 job->SetTranscode(SerializationToolbox::ReadString(body, TRANSCODE));
b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	332 }
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	333
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	334 for (std::set<std::string>::const_iterator
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	335 it = resources.begin(); it != resources.end(); ++it)
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	336 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	337 context.AddChildInstances(job, it);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	338 }
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	339
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	340 job->AddTrailingStep();
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	341
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	342 OrthancRestApi::GetApi(call).SubmitCommandsJob
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	343 (call, job.release(), true /* synchronous by default */, body);
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	344 }
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	345
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	346
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	347 static void SubmitModificationJob(std::unique_ptr<DicomModification>& modification,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	348 bool isAnonymization,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	349 RestApiPostCall& call,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	350 const Json::Value& body,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	351 ResourceType outputLevel)
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	352 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	353 // This was the only flavor in Orthanc <= 1.9.3
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	354 std::set<std::string> resources;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	355 resources.insert(call.GetUriComponent("id", ""));
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	356
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	357 SubmitModificationJob(modification, isAnonymization, call, body, outputLevel,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	358 true /* single resource */, resources);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	359 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	360
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	361
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	362 static void SubmitBulkJob(std::unique_ptr<DicomModification>& modification,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	363 bool isAnonymization,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	364 RestApiPostCall& call,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	365 const Json::Value& body)
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	366 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	367 std::set<std::string> resources;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	368 SerializationToolbox::ReadSetOfStrings(resources, body, "Resources");
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	369
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	370 SubmitModificationJob(modification, isAnonymization,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	371 call, body, ResourceType_Instance /* arbitrary value, unused */,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	372 false /* multiple resources */, resources);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	373 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	374
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	375
2639 75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	376 template <enum ResourceType resourceType>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	377 static void ModifyResource(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	379 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	380 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	381 OrthancRestApi::DocumentSubmitCommandsJob(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	382 DocumentModifyOptions(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	383 const std::string r = GetResourceTypeText(resourceType, false /* plural /, false / lower case */);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	384 call.GetDocumentation()
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	385 .SetTag(GetResourceTypeText(resourceType, true /* plural /, true / upper case */))
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	386 .SetSummary("Modify " + r)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	387 .SetDescription("Start a job that will modify all the DICOM instances within the " + r +
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	388 " whose identifier is provided in the URL. The modified DICOM instances will be "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	389 "stored into a brand new " + r + ", whose Orthanc identifiers will be returned by the job. "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	390 "https://book.orthanc-server.com/users/anonymization.html#modification-of-studies-or-series")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	391 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest");
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	392 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	393 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	394
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	395 std::unique_ptr<DicomModification> modification(new DicomModification);
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2639 diff changeset	396
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	397 Json::Value body;
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	398 ParseModifyRequest(body, *modification, call);
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	399
2639 75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	400 modification->SetLevel(resourceType);
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	401
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	402 SubmitModificationJob(modification, false /* not an anonymization */,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	403 call, body, resourceType);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	407 // New in Orthanc 1.9.4
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	408 static void BulkModify(RestApiPostCall& call)
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	409 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	410 if (call.IsDocumentation())
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	411 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	412 OrthancRestApi::DocumentSubmitCommandsJob(call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	413 DocumentModifyOptions(call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	414 call.GetDocumentation()
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	415 .SetTag("System")
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4693 diff changeset	416 .SetSummary("Modify a set of resources")
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	417 .SetRequestField("Resources", RestApiCallDocumentation::Type_JsonListOfStrings,
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	418 "List of the Orthanc identifiers of the patients/studies/series/instances of interest.", true)
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	419 .SetDescription("Start a job that will modify all the DICOM patients, studies, series or instances "
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	420 "whose identifiers are provided in the `Resources` field.")
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	421 .AddAnswerType(MimeType_Json, "The list of all the resources that have been altered by this modification");
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	422 return;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	423 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	424
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	425 std::unique_ptr<DicomModification> modification(new DicomModification);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	426
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	427 Json::Value body;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	428 ParseModifyRequest(body, *modification, call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	429
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	430 modification->SetLevel(DetectModifyLevel(*modification));
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	431
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	432 SubmitBulkJob(modification, false /* not an anonymization */, call, body);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	433 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	434
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	435
2639 75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	436 template <enum ResourceType resourceType>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	437 static void AnonymizeResource(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	439 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	440 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	441 OrthancRestApi::DocumentSubmitCommandsJob(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	442 DocumentAnonymizationOptions(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	443 const std::string r = GetResourceTypeText(resourceType, false /* plural /, false / lower case */);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	444 call.GetDocumentation()
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	445 .SetTag(GetResourceTypeText(resourceType, true /* plural /, true / upper case */))
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	446 .SetSummary("Anonymize " + r)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	447 .SetDescription("Start a job that will anonymize all the DICOM instances within the " + r +
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	448 " whose identifier is provided in the URL. The modified DICOM instances will be "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	449 "stored into a brand new " + r + ", whose Orthanc identifiers will be returned by the job. "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	450 "https://book.orthanc-server.com/users/anonymization.html#anonymization-of-patients-studies-or-series")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	451 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest");
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	452 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	453 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	454
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	455 std::unique_ptr<DicomModification> modification(new DicomModification);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	457 Json::Value body;
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	458 ParseAnonymizationRequest(body, *modification, call);
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2639 diff changeset	459
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	460 SubmitModificationJob(modification, true /* anonymization */,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	461 call, body, resourceType);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	465 // New in Orthanc 1.9.4
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	466 static void BulkAnonymize(RestApiPostCall& call)
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	467 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	468 if (call.IsDocumentation())
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	469 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	470 OrthancRestApi::DocumentSubmitCommandsJob(call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	471 DocumentAnonymizationOptions(call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	472 call.GetDocumentation()
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	473 .SetTag("System")
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4693 diff changeset	474 .SetSummary("Anonymize a set of resources")
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	475 .SetRequestField("Resources", RestApiCallDocumentation::Type_JsonListOfStrings,
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	476 "List of the Orthanc identifiers of the patients/studies/series/instances of interest.", true)
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	477 .SetDescription("Start a job that will anonymize all the DICOM patients, studies, series or instances "
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	478 "whose identifiers are provided in the `Resources` field.")
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	479 .AddAnswerType(MimeType_Json, "The list of all the resources that have been created by this anonymization");
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	480 return;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	481 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	482
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	483 std::unique_ptr<DicomModification> modification(new DicomModification);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	484
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	485 Json::Value body;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	486 ParseAnonymizationRequest(body, *modification, call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	487
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	488 SubmitBulkJob(modification, true /* anonymization */, call, body);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	489 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	490
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	491
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	492 static void StoreCreatedInstance(std::string& id /* out */,
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	493 RestApiPostCall& call,
2899 5dd649de253d POST-ing a DICOM file to "/instances" also answers the patient/study/series ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2869 diff changeset	494 ParsedDicomFile& dicom,
5dd649de253d POST-ing a DICOM file to "/instances" also answers the patient/study/series ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2869 diff changeset	495 bool sendAnswer)
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	496 {
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4479 diff changeset	497 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom));
8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4479 diff changeset	498 toStore->SetOrigin(DicomInstanceOrigin::FromRest(call));
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	499
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	500 ServerContext& context = OrthancRestApi::GetContext(call);
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4479 diff changeset	501 StoreStatus status = context.Store(id, *toStore, StoreInstanceMode_Default);
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	502
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	503 if (status == StoreStatus_Failure)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	504 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	505 throw OrthancException(ErrorCode_CannotStoreInstance);
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	506 }
2899 5dd649de253d POST-ing a DICOM file to "/instances" also answers the patient/study/series ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2869 diff changeset	507
5dd649de253d POST-ing a DICOM file to "/instances" also answers the patient/study/series ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2869 diff changeset	508 if (sendAnswer)
5dd649de253d POST-ing a DICOM file to "/instances" also answers the patient/study/series ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2869 diff changeset	509 {
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4479 diff changeset	510 OrthancRestApi::GetApi(call).AnswerStoredInstance(call, *toStore, status, id);
2899 5dd649de253d POST-ing a DICOM file to "/instances" also answers the patient/study/series ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2869 diff changeset	511 }
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	512 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	513
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	514
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	515 static void CreateDicomV1(ParsedDicomFile& dicom,
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	516 RestApiPostCall& call,
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	517 const Json::Value& request)
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	518 {
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	519 // curl http://localhost:8042/tools/create-dicom -X POST -d '{"PatientName":"Hello^World"}'
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 796 diff changeset	520 // curl http://localhost:8042/tools/create-dicom -X POST -d '{"PatientName":"Hello^World","PixelData":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gUGDDcB53FulQAAAElJREFUGNNtj0sSAEEEQ1+U+185s1CtmRkblQ9CZldsKHJDk6DLGLJa6chjh0ooQmpjXMM86zPwydGEj6Ed/UGykkEM8X+p3u8/8LcOJIWLGeMAAAAASUVORK5CYII="}'
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	521
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	522 assert(request.isObject());
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	523 LOG(WARNING) << "Using a deprecated call to /tools/create-dicom";
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	524
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	525 Json::Value::Members members = request.getMemberNames();
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	526 for (size_t i = 0; i < members.size(); i++)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	527 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	528 const std::string& name = members[i];
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	529 if (request[name].type() != Json::stringValue)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	530 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	531 throw OrthancException(ErrorCode_CreateDicomNotString);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	532 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	533
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	534 std::string value = request[name].asString();
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	535
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	536 DicomTag tag = FromDcmtkBridge::ParseTag(name);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	537 if (tag == DICOM_TAG_PIXEL_DATA)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	538 {
1562 2084b7c20478 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1558 diff changeset	539 dicom.EmbedContent(value);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	540 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	541 else
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	542 {
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	543 // This is V1, don't try and decode data URI scheme
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	544 dicom.ReplacePlainString(tag, value);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	545 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	546 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	547 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	548
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	549
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	550 static void InjectTags(ParsedDicomFile& dicom,
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	551 const Json::Value& tags,
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	552 bool decodeBinaryTags,
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	553 const std::string& privateCreator,
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	554 bool force)
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	555 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	556 if (tags.type() != Json::objectValue)
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	557 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	558 throw OrthancException(ErrorCode_BadRequest, "Tags field is not an array");
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	559 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	560
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	561 // Inject the user-specified tags
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	562 Json::Value::Members members = tags.getMemberNames();
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	563 for (size_t i = 0; i < members.size(); i++)
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	564 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	565 const std::string& name = members[i];
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	566 DicomTag tag = FromDcmtkBridge::ParseTag(name);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	567
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	568 if (tag != DICOM_TAG_SPECIFIC_CHARACTER_SET)
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	569 {
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	570 if (!force &&
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	571 tag != DICOM_TAG_PATIENT_ID &&
1640 48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	572 tag != DICOM_TAG_ACQUISITION_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	573 tag != DICOM_TAG_ACQUISITION_TIME &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	574 tag != DICOM_TAG_CONTENT_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	575 tag != DICOM_TAG_CONTENT_TIME &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	576 tag != DICOM_TAG_INSTANCE_CREATION_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	577 tag != DICOM_TAG_INSTANCE_CREATION_TIME &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	578 tag != DICOM_TAG_SERIES_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	579 tag != DICOM_TAG_SERIES_TIME &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	580 tag != DICOM_TAG_STUDY_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	581 tag != DICOM_TAG_STUDY_TIME &&
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	582 dicom.HasTag(tag))
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	583 {
2952 4ceb9bf7b00c added details string in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2936 diff changeset	584 throw OrthancException(ErrorCode_CreateDicomOverrideTag, name);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	585 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	586
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	587 if (tag == DICOM_TAG_PIXEL_DATA)
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	588 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	589 throw OrthancException(ErrorCode_CreateDicomUseContent);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	590 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	591 else
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	592 {
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	593 dicom.Replace(tag, tags[name], decodeBinaryTags, DicomReplaceMode_InsertIfAbsent, privateCreator);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	594 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	595 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	596 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	597 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	598
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	599
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	600 static void CreateSeries(RestApiPostCall& call,
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	601 ParsedDicomFile& base /* in */,
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	602 const Json::Value& content,
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	603 bool decodeBinaryTags,
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	604 const std::string& privateCreator,
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	605 bool force)
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	606 {
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	607 assert(content.isArray());
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	608 assert(content.size() > 0);
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	609 ServerContext& context = OrthancRestApi::GetContext(call);
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	610
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	611 base.ReplacePlainString(DICOM_TAG_IMAGES_IN_ACQUISITION, boost::lexical_cast<std::string>(content.size()));
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	612 base.ReplacePlainString(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS, "1");
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	613
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	614 std::string someInstance;
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	615
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	616 try
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	617 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	618 for (Json::ArrayIndex i = 0; i < content.size(); i++)
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	619 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	620 std::unique_ptr<ParsedDicomFile> dicom(base.Clone(false));
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	621 const Json::Value* payload = NULL;
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	622
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	623 if (content[i].type() == Json::stringValue)
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	624 {
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	625 payload = &content[i];
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	626 }
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	627 else if (content[i].type() == Json::objectValue)
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	628 {
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	629 if (!content[i].isMember("Content"))
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	630 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	631 throw OrthancException(ErrorCode_CreateDicomNoPayload);
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	632 }
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	633
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	634 payload = &content[i]["Content"];
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	635
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	636 if (content[i].isMember("Tags"))
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	637 {
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	638 InjectTags(*dicom, content[i]["Tags"], decodeBinaryTags, privateCreator, force);
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	639 }
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	640 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	641
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	642 if (payload == NULL \|\|
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	643 payload->type() != Json::stringValue)
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	644 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	645 throw OrthancException(ErrorCode_CreateDicomUseDataUriScheme);
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	646 }
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	647
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	648 dicom->EmbedContent(payload->asString());
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	649 dicom->ReplacePlainString(DICOM_TAG_INSTANCE_NUMBER, boost::lexical_cast<std::string>(i + 1));
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	650 dicom->ReplacePlainString(DICOM_TAG_IMAGE_INDEX, boost::lexical_cast<std::string>(i + 1));
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	651
2899 5dd649de253d POST-ing a DICOM file to "/instances" also answers the patient/study/series ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2869 diff changeset	652 StoreCreatedInstance(someInstance, call, *dicom, false);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	653 }
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	654 }
1616 644c32c07306 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	655 catch (OrthancException&)
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	656 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	657 // Error: Remove the newly-created series
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	658
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	659 std::string series;
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	660 if (context.GetIndex().LookupParent(series, someInstance))
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	661 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	662 Json::Value dummy;
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	663 context.GetIndex().DeleteResource(dummy, series, ResourceType_Series);
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	664 }
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	665
1616 644c32c07306 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	666 throw;
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	667 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	668
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	669 std::string series;
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	670 if (context.GetIndex().LookupParent(series, someInstance))
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	671 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	672 OrthancRestApi::GetApi(call).AnswerStoredResource(call, series, ResourceType_Series, StoreStatus_Success);
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	673 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	674 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	675
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	676
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	677 static void CreateDicomV2(RestApiPostCall& call,
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	678 const Json::Value& request)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	679 {
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	680 static const char* const CONTENT = "Content";
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	681 static const char* const FORCE = "Force";
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	682 static const char* const INTERPRET_BINARY_TAGS = "InterpretBinaryTags";
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	683 static const char* const PARENT = "Parent";
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	684 static const char* const PRIVATE_CREATOR = "PrivateCreator";
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	685 static const char* const SPECIFIC_CHARACTER_SET_2 = "SpecificCharacterSet";
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	686 static const char* const TAGS = "Tags";
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	687 static const char* const TYPE = "Type";
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	688 static const char* const VALUE = "Value";
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	689
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	690 assert(request.isObject());
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	691 ServerContext& context = OrthancRestApi::GetContext(call);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	692
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	693 if (!request.isMember(TAGS) \|\|
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	694 request[TAGS].type() != Json::objectValue)
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	695 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	696 throw OrthancException(ErrorCode_BadRequest);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	697 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	698
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1699 diff changeset	699 ParsedDicomFile dicom(true);
1558 124de28b32ed fix encodings of newly created dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	700
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	701 {
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	702 Encoding encoding;
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	703
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	704 if (request[TAGS].isMember(SPECIFIC_CHARACTER_SET_2))
1558 124de28b32ed fix encodings of newly created dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	705 {
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	706 const char* tmp = request[TAGS][SPECIFIC_CHARACTER_SET_2].asCString();
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	707 if (!GetDicomEncoding(encoding, tmp))
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	708 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	709 throw OrthancException(ErrorCode_ParameterOutOfRange,
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	710 "Unknown specific character set: " + std::string(tmp));
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	711 }
1558 124de28b32ed fix encodings of newly created dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	712 }
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	713 else
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	714 {
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2361 diff changeset	715 encoding = GetDefaultDicomEncoding();
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	716 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	717
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	718 dicom.SetEncoding(encoding);
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	719 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	720
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	721 ResourceType parentType = ResourceType_Instance;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	722
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	723 if (request.isMember(PARENT))
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	724 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	725 // Locate the parent tags
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	726 std::string parent = request[PARENT].asString();
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	727 if (!context.GetIndex().LookupResourceType(parentType, parent))
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	728 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	729 throw OrthancException(ErrorCode_CreateDicomBadParent);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	730 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	731
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	732 if (parentType == ResourceType_Instance)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	733 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	734 throw OrthancException(ErrorCode_CreateDicomParentIsInstance);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	735 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	736
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	737 // Select one existing child instance of the parent resource, to
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	738 // retrieve all its tags
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	739 Json::Value siblingTags;
3009 750de70b3603 make "/tools/create-dicom" more tolerant to invalid specific character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	740 std::string siblingInstanceId;
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	741
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	742 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	743 // Retrieve all the instances of the parent resource
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	744 std::list<std::string> siblingInstances;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	745 context.GetIndex().GetChildInstances(siblingInstances, parent);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	746
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	747 if (siblingInstances.empty())
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	748 {
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	749 // Error: No instance (should never happen)
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	750 throw OrthancException(ErrorCode_InternalError);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	751 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	752
3009 750de70b3603 make "/tools/create-dicom" more tolerant to invalid specific character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	753 siblingInstanceId = siblingInstances.front();
750de70b3603 make "/tools/create-dicom" more tolerant to invalid specific character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	754 context.ReadDicomAsJson(siblingTags, siblingInstanceId);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	755 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	756
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	757
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	758 // Choose the same encoding as the parent resource
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	759 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	760 static const char* SPECIFIC_CHARACTER_SET = "0008,0005";
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	761
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	762 if (siblingTags.isMember(SPECIFIC_CHARACTER_SET))
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	763 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	764 Encoding encoding;
3009 750de70b3603 make "/tools/create-dicom" more tolerant to invalid specific character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	765
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	766 if (!siblingTags[SPECIFIC_CHARACTER_SET].isMember(VALUE) \|\|
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	767 siblingTags[SPECIFIC_CHARACTER_SET][VALUE].type() != Json::stringValue \|\|
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	768 !GetDicomEncoding(encoding, siblingTags[SPECIFIC_CHARACTER_SET][VALUE].asCString()))
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	769 {
3009 750de70b3603 make "/tools/create-dicom" more tolerant to invalid specific character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	770 LOG(WARNING) << "Instance with an incorrect Specific Character Set, "
750de70b3603 make "/tools/create-dicom" more tolerant to invalid specific character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	771 << "using the default Orthanc encoding: " << siblingInstanceId;
750de70b3603 make "/tools/create-dicom" more tolerant to invalid specific character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	772 encoding = GetDefaultDicomEncoding();
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	773 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	774
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	775 dicom.SetEncoding(encoding);
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	776 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	777 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	778
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	779
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	780 // Retrieve the tags for all the parent modules
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	781 typedef std::set<DicomTag> ModuleTags;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	782 ModuleTags moduleTags;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	783
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	784 ResourceType type = parentType;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	785 for (;;)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	786 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	787 DicomTag::AddTagsForModule(moduleTags, GetModule(type));
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	788
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	789 if (type == ResourceType_Patient)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	790 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	791 break; // We're done
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	792 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	793
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	794 // Go up
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	795 std::string tmp;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	796 if (!context.GetIndex().LookupParent(tmp, parent))
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	797 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	798 throw OrthancException(ErrorCode_InternalError);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	799 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	800
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	801 parent = tmp;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	802 type = GetParentResourceType(type);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	803 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	804
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	805 for (ModuleTags::const_iterator it = moduleTags.begin();
1616 644c32c07306 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	806 it != moduleTags.end(); ++it)
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	807 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	808 std::string t = it->Format();
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	809 if (siblingTags.isMember(t))
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	810 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	811 const Json::Value& tag = siblingTags[t];
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	812 if (tag[TYPE] == "Null")
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	813 {
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	814 dicom.ReplacePlainString(*it, "");
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	815 }
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	816 else if (tag[TYPE] == "String")
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	817 {
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	818 std::string value = tag[VALUE].asString(); // This is an UTF-8 value (as it comes from JSON)
3441 6cc72ebfd6ef Fix issue #141 (/tools/create-dicom removes non-ASCII characters from study description) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3217 diff changeset	819 dicom.ReplacePlainString(*it, value);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	820 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	821 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	822 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	823 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	824
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	825
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1652 diff changeset	826 bool decodeBinaryTags = true;
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	827 if (request.isMember(INTERPRET_BINARY_TAGS))
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	828 {
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	829 const Json::Value& v = request[INTERPRET_BINARY_TAGS];
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	830 if (v.type() != Json::booleanValue)
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	831 {
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	832 throw OrthancException(ErrorCode_BadRequest);
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	833 }
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	834
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1652 diff changeset	835 decodeBinaryTags = v.asBool();
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	836 }
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	837
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	838
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	839 // New argument in Orthanc 1.6.0
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	840 std::string privateCreator;
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	841 if (request.isMember(PRIVATE_CREATOR))
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	842 {
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	843 const Json::Value& v = request[PRIVATE_CREATOR];
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	844 if (v.type() != Json::stringValue)
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	845 {
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	846 throw OrthancException(ErrorCode_BadRequest);
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	847 }
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	848
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	849 privateCreator = v.asString();
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	850 }
3709 1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	851 else
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	852 {
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	853 OrthancConfiguration::ReaderLock lock;
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	854 privateCreator = lock.GetConfiguration().GetDefaultPrivateCreator();
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	855 }
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	856
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	857
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	858 // New in Orthanc 1.9.0
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	859 bool force = false;
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	860 if (request.isMember(FORCE))
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	861 {
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	862 const Json::Value& v = request[FORCE];
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	863 if (v.type() != Json::booleanValue)
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	864 {
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	865 throw OrthancException(ErrorCode_BadRequest);
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	866 }
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	867
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	868 force = v.asBool();
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	869 }
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	870
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	871
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	872 // Inject time-related information
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	873 std::string date, time;
2475 8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	874 SystemToolbox::GetNowDicom(date, time, true /* use UTC time (not local time) */);
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	875 dicom.ReplacePlainString(DICOM_TAG_ACQUISITION_DATE, date);
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	876 dicom.ReplacePlainString(DICOM_TAG_ACQUISITION_TIME, time);
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	877 dicom.ReplacePlainString(DICOM_TAG_CONTENT_DATE, date);
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	878 dicom.ReplacePlainString(DICOM_TAG_CONTENT_TIME, time);
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	879 dicom.ReplacePlainString(DICOM_TAG_INSTANCE_CREATION_DATE, date);
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	880 dicom.ReplacePlainString(DICOM_TAG_INSTANCE_CREATION_TIME, time);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	881
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	882 if (parentType == ResourceType_Patient \|\|
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	883 parentType == ResourceType_Study \|\|
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	884 parentType == ResourceType_Instance /* no parent */)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	885 {
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	886 dicom.ReplacePlainString(DICOM_TAG_SERIES_DATE, date);
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	887 dicom.ReplacePlainString(DICOM_TAG_SERIES_TIME, time);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	888 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	889
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	890 if (parentType == ResourceType_Patient \|\|
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	891 parentType == ResourceType_Instance /* no parent */)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	892 {
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	893 dicom.ReplacePlainString(DICOM_TAG_STUDY_DATE, date);
b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	894 dicom.ReplacePlainString(DICOM_TAG_STUDY_TIME, time);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	895 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	896
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	897
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	898 InjectTags(dicom, request[TAGS], decodeBinaryTags, privateCreator, force);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	899
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	900
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	901 // Inject the content (either an image, or a PDF file)
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	902 if (request.isMember(CONTENT))
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	903 {
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	904 const Json::Value& content = request[CONTENT];
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	905
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	906 if (content.type() == Json::stringValue)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	907 {
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	908 dicom.EmbedContent(request[CONTENT].asString());
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	909
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	910 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	911 else if (content.type() == Json::arrayValue)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	912 {
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	913 if (content.size() > 0)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	914 {
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	915 // Let's create a series instead of a single instance
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	916 CreateSeries(call, dicom, content, decodeBinaryTags, privateCreator, force);
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	917 return;
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	918 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	919 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	920 else
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	921 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	922 throw OrthancException(ErrorCode_CreateDicomUseDataUriScheme);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	923 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	924 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	925
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	926 std::string id;
2899 5dd649de253d POST-ing a DICOM file to "/instances" also answers the patient/study/series ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2869 diff changeset	927 StoreCreatedInstance(id, call, dicom, true);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	928 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	929
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	930
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	931 static void CreateDicom(RestApiPostCall& call)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	932 {
4422 48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	933 if (call.IsDocumentation())
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	934 {
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	935 call.GetDocumentation()
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	936 .SetTag("System")
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	937 .SetSummary("Create one DICOM instance")
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	938 .SetDescription("Create one DICOM instance, and store it into Orthanc")
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	939 .SetRequestField("Tags", RestApiCallDocumentation::Type_JsonObject,
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	940 "Associative array containing the tags of the new instance to be created", true)
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	941 .SetRequestField("Content", RestApiCallDocumentation::Type_String,
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	942 "This field can be used to embed an image (pixel data) or a PDF inside the created DICOM instance. "
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	943 "The PNG image, the JPEG image or the PDF file must be provided using their "
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	944 "[data URI scheme encoding](https://en.wikipedia.org/wiki/Data_URI_scheme). "
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	945 "This field can possibly contain a JSON array, in which case a DICOM series is created "
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	946 "containing one DICOM instance for each item in the `Content` field.", false)
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	947 .SetRequestField("Parent", RestApiCallDocumentation::Type_String,
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	948 "If present, the newly created instance will be attached to the parent DICOM resource "
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	949 "whose Orthanc identifier is contained in this field. The DICOM tags of the parent "
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	950 "modules in the DICOM hierarchy will be automatically copied to the newly created instance.", false)
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	951 .SetRequestField("InterpretBinaryTags", RestApiCallDocumentation::Type_Boolean,
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	952 "If some value in the `Tags` associative array is formatted according to some "
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	953 "[data URI scheme encoding](https://en.wikipedia.org/wiki/Data_URI_scheme), "
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	954 "whether this value is decoded to a binary value or kept as such (`true` by default)", false)
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	955 .SetRequestField("PrivateCreator", RestApiCallDocumentation::Type_String,
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	956 "The private creator to be used for private tags in `Tags`", false)
4479 1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	957 .SetRequestField("Force", RestApiCallDocumentation::Type_Boolean,
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	958 "Avoid the consistency checks for the DICOM tags that enforce the DICOM model of the real-world. "
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	959 "You can notably use this flag if you need to manually set the tags `StudyInstanceUID`, "
1619cffd1948 "/tools/create-dicom": New flag "Force" to bypass consistency checks for the DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	960 "`SeriesInstanceUID`, or `SOPInstanceUID`. Be careful with this feature.", false)
4422 48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	961 .SetAnswerField("ID", RestApiCallDocumentation::Type_String, "Orthanc identifier of the newly created instance")
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	962 .SetAnswerField("Path", RestApiCallDocumentation::Type_String, "Path to access the instance in the REST API");
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	963 return;
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	964 }
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	965
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	966 Json::Value request;
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	967 if (!call.ParseJsonRequest(request) \|\|
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	968 !request.isObject())
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	969 {
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	970 throw OrthancException(ErrorCode_BadRequest);
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	971 }
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	972
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	973 if (request.isMember("Tags"))
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	974 {
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	975 CreateDicomV2(call, request);
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	976 }
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	977 else
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	978 {
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	979 // Compatibility with Orthanc <= 0.9.3
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1699 diff changeset	980 ParsedDicomFile dicom(true);
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	981 CreateDicomV1(dicom, call, request);
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	982
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	983 std::string id;
2899 5dd649de253d POST-ing a DICOM file to "/instances" also answers the patient/study/series ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2869 diff changeset	984 StoreCreatedInstance(id, call, dicom, true);
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	985 }
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	986 }
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	987
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	988
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	989 static void SplitStudy(RestApiPostCall& call)
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	990 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	991 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	992 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	993 OrthancRestApi::DocumentSubmitCommandsJob(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	994 call.GetDocumentation()
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	995 .SetTag("Studies")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	996 .SetSummary("Split study")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	997 .SetDescription("Start a new job so as to split the DICOM study whose Orthanc identifier is provided in the URL, "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	998 "by taking some of its children series out of it and putting them into a brand new study (this "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	999 "new study is created by setting the `StudyInstanceUID` tag to a random identifier): "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1000 "https://book.orthanc-server.com/users/anonymization.html#splitting")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1001 .SetUriArgument("id", "Orthanc identifier of the study of interest")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1002 .SetRequestField("Series", RestApiCallDocumentation::Type_JsonListOfStrings,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1003 "The list of series to be separated from the parent study (mandatory option). "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1004 "These series must all be children of the same source study, that is specified in the URI.", true)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1005 .SetRequestField("Replace", RestApiCallDocumentation::Type_JsonObject,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1006 "Associative array to change the value of some DICOM tags in the new study. "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1007 "These tags must be part of the \"Patient Module Attributes\" or the \"General Study "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1008 "Module Attributes\", as specified by the DICOM 2011 standard in Tables C.7-1 and C.7-3.", false)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1009 .SetRequestField("Remove", RestApiCallDocumentation::Type_JsonListOfStrings,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1010 "List of tags that must be removed in the new study (from the same modules as in the `Replace` option)", false)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1011 .SetRequestField("KeepSource", RestApiCallDocumentation::Type_Boolean,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1012 "If set to `true`, instructs Orthanc to keep a copy of the original series in the source study. "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1013 "By default, the original series are deleted from Orthanc.", false);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1014 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1015 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1016
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1017 ServerContext& context = OrthancRestApi::GetContext(call);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1018
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1019 Json::Value request;
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1020 if (!call.ParseJsonRequest(request))
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1021 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1022 // Bad JSON request
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1023 throw OrthancException(ErrorCode_BadFileFormat);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1024 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1025
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1026 const std::string study = call.GetUriComponent("id", "");
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1027
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	1028 std::unique_ptr<SplitStudyJob> job(new SplitStudyJob(context, study));
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1029 job->SetOrigin(call);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1030
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1031 std::vector<std::string> series;
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1032 SerializationToolbox::ReadArrayOfStrings(series, request, "Series");
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1033
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1034 for (size_t i = 0; i < series.size(); i++)
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1035 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1036 job->AddSourceSeries(series[i]);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1037 }
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	1038
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1039 job->AddTrailingStep();
8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1040
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	1041 SetKeepSource(*job, request);
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1042
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1043 static const char* REMOVE = "Remove";
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1044 if (request.isMember(REMOVE))
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1045 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1046 if (request[REMOVE].type() != Json::arrayValue)
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1047 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1048 throw OrthancException(ErrorCode_BadFileFormat);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1049 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1050
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1051 for (Json::Value::ArrayIndex i = 0; i < request[REMOVE].size(); i++)
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1052 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1053 if (request[REMOVE][i].type() != Json::stringValue)
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1054 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1055 throw OrthancException(ErrorCode_BadFileFormat);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1056 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1057 else
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1058 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1059 job->Remove(FromDcmtkBridge::ParseTag(request[REMOVE][i].asCString()));
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1060 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1061 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1062 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1063
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1064 static const char* REPLACE = "Replace";
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1065 if (request.isMember(REPLACE))
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1066 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1067 if (request[REPLACE].type() != Json::objectValue)
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1068 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1069 throw OrthancException(ErrorCode_BadFileFormat);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1070 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1071
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1072 Json::Value::Members tags = request[REPLACE].getMemberNames();
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1073
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1074 for (size_t i = 0; i < tags.size(); i++)
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1075 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1076 const Json::Value& value = request[REPLACE][tags[i]];
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1077
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1078 if (value.type() != Json::stringValue)
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1079 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1080 throw OrthancException(ErrorCode_BadFileFormat);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1081 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1082 else
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1083 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1084 job->Replace(FromDcmtkBridge::ParseTag(tags[i]), value.asString());
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1085 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1086 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1087 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1088
2869 2bd87764709c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1089 OrthancRestApi::GetApi(call).SubmitCommandsJob
2bd87764709c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1090 (call, job.release(), true /* synchronous by default */, request);
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1091 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1092
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1093
2853 52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1094 static void MergeStudy(RestApiPostCall& call)
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1095 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1096 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1097 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1098 OrthancRestApi::DocumentSubmitCommandsJob(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1099 call.GetDocumentation()
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1100 .SetTag("Studies")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1101 .SetSummary("Merge study")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1102 .SetDescription("Start a new job so as to move some DICOM series into the DICOM study whose Orthanc identifier "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1103 "is provided in the URL: https://book.orthanc-server.com/users/anonymization.html#merging")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1104 .SetUriArgument("id", "Orthanc identifier of the study of interest")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1105 .SetRequestField("Resources", RestApiCallDocumentation::Type_JsonListOfStrings,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1106 "The list of DICOM resources (patients, studies, series, and/or instances) to be merged "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1107 "into the study of interest (mandatory option)", true)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1108 .SetRequestField("KeepSource", RestApiCallDocumentation::Type_Boolean,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1109 "If set to `true`, instructs Orthanc to keep a copy of the original resources in their source study. "
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1110 "By default, the original resources are deleted from Orthanc.", false);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1111 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1112 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1113
2853 52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1114 ServerContext& context = OrthancRestApi::GetContext(call);
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1115
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1116 Json::Value request;
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1117 if (!call.ParseJsonRequest(request))
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1118 {
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1119 // Bad JSON request
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1120 throw OrthancException(ErrorCode_BadFileFormat);
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1121 }
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1122
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1123 const std::string study = call.GetUriComponent("id", "");
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1124
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	1125 std::unique_ptr<MergeStudyJob> job(new MergeStudyJob(context, study));
2853 52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1126 job->SetOrigin(call);
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1127
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1128 std::vector<std::string> resources;
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1129 SerializationToolbox::ReadArrayOfStrings(resources, request, "Resources");
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1130
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1131 for (size_t i = 0; i < resources.size(); i++)
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1132 {
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1133 job->AddSource(resources[i]);
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1134 }
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1135
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1136 job->AddTrailingStep();
8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1137
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	1138 SetKeepSource(*job, request);
2853 52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1139
2869 2bd87764709c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1140 OrthancRestApi::GetApi(call).SubmitCommandsJob
2bd87764709c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1141 (call, job.release(), true /* synchronous by default */, request);
2853 52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1142 }
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1143
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1144
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1145 void OrthancRestApi::RegisterAnonymizeModify()
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1146 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1147 Register("/instances/{id}/modify", ModifyInstance);
2639 75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1148 Register("/series/{id}/modify", ModifyResource<ResourceType_Series>);
75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1149 Register("/studies/{id}/modify", ModifyResource<ResourceType_Study>);
75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1150 Register("/patients/{id}/modify", ModifyResource<ResourceType_Patient>);
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1151 Register("/tools/bulk-modify", BulkModify);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1152
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1153 Register("/instances/{id}/anonymize", AnonymizeInstance);
2639 75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1154 Register("/series/{id}/anonymize", AnonymizeResource<ResourceType_Series>);
75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1155 Register("/studies/{id}/anonymize", AnonymizeResource<ResourceType_Study>);
75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1156 Register("/patients/{id}/anonymize", AnonymizeResource<ResourceType_Patient>);
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1157 Register("/tools/bulk-anonymize", BulkAnonymize);
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	1158
1120 009dce4ea2f6 /tools/create-dicom now accepts PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	1159 Register("/tools/create-dicom", CreateDicom);
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1160
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1161 Register("/studies/{id}/split", SplitStudy);
2853 52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1162 Register("/studies/{id}/merge", MergeStudy);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1163 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1164 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 4709:a9a75281cae9 openssl-3.x