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

annotate OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 4723:4b721432fa67 openssl-3.x

integration mainline->openssl-3.x

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 24 Jun 2021 12:50:01 +0200
parents	783f8a048035
children	61da49321754

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
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	41
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	42 static const char* const CONTENT = "Content";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	43 static const char* const FORCE = "Force";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	44 static const char* const INSTANCES = "Instances";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	45 static const char* const INTERPRET_BINARY_TAGS = "InterpretBinaryTags";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	46 static const char* const KEEP = "Keep";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	47 static const char* const KEEP_PRIVATE_TAGS = "KeepPrivateTags";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	48 static const char* const KEEP_SOURCE = "KeepSource";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	49 static const char* const PARENT = "Parent";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	50 static const char* const PRIVATE_CREATOR = "PrivateCreator";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	51 static const char* const REMOVE = "Remove";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	52 static const char* const REPLACE = "Replace";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	53 static const char* const RESOURCES = "Resources";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	54 static const char* const SERIES = "Series";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	55 static const char* const TAGS = "Tags";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	56 static const char* const TRANSCODE = "Transcode";
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	57
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	58
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 namespace Orthanc
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 // Modification of DICOM instances ------------------------------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2518 diff changeset	63
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 static std::string GeneratePatientName(ServerContext& context)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	66 uint64_t seq = context.GetIndex().IncrementGlobalSequence(GlobalProperty_AnonymizationSequence, true /* shared */);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 return "Anonymized" + boost::lexical_cast<std::string>(seq);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	71 static void DocumentModifyOptions(RestApiPostCall& call)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	72 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	73 // Check out "DicomModification::ParseModifyRequest()"
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	74 call.GetDocumentation()
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	75 .SetRequestField(TRANSCODE, RestApiCallDocumentation::Type_String,
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	76 "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	77 "https://book.orthanc-server.com/faq/transcoding.html", false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	78 .SetRequestField(FORCE, RestApiCallDocumentation::Type_Boolean,
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	79 "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	80 "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	81 .SetRequestField("RemovePrivateTags", RestApiCallDocumentation::Type_Boolean,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	82 "Remove the private tags from the DICOM instances (defaults to `false`)", false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	83 .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	84 "Associative array to change the value of some DICOM tags in the DICOM instances. " INFO_SUBSEQUENCES, false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	85 .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	86 "List of tags that must be removed from the DICOM instances. " INFO_SUBSEQUENCES, false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	87 .SetRequestField(KEEP, RestApiCallDocumentation::Type_JsonListOfStrings,
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	88 "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	89 "`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	90 "as this breaks the DICOM model of the real world.", false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	91 .SetRequestField(PRIVATE_CREATOR, RestApiCallDocumentation::Type_String,
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	92 "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	93 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	94
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	95
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	96 static void DocumentAnonymizationOptions(RestApiPostCall& call)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	97 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	98 // Check out "DicomModification::ParseAnonymizationRequest()"
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	99 call.GetDocumentation()
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	100 .SetRequestField(FORCE, RestApiCallDocumentation::Type_Boolean,
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	101 "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	102 "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	103 .SetRequestField("DicomVersion", RestApiCallDocumentation::Type_String,
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	104 "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	105 "configuration option `DeidentifyLogsDicomVersion` for possible values.", false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	106 .SetRequestField(KEEP_PRIVATE_TAGS, RestApiCallDocumentation::Type_Boolean,
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	107 "Keep the private tags from the DICOM instances (defaults to `false`)", false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	108 .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	109 "Associative array to change the value of some DICOM tags in the DICOM instances. " INFO_SUBSEQUENCES, false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	110 .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	111 "List of additional tags to be removed from the DICOM instances. " INFO_SUBSEQUENCES, false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	112 .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	113 "List of DICOM tags whose value must not be destroyed by the anonymization. " INFO_SUBSEQUENCES, false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	114 .SetRequestField(PRIVATE_CREATOR, RestApiCallDocumentation::Type_String,
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	115 "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	116 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	117
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	118
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	119 static void ParseModifyRequest(Json::Value& request,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	120 DicomModification& target,
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	121 const RestApiPostCall& call)
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	122 {
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2639 diff changeset	123 // 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	124
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	125 {
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	126 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	127 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	128 }
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
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	130 if (call.ParseJsonRequest(request))
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	131 {
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2518 diff changeset	132 target.ParseModifyRequest(request);
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	133 }
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	134 else
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	135 {
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	136 throw OrthancException(ErrorCode_BadFileFormat);
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2250 diff changeset	137 }
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	138 }
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2250 diff changeset	139
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	140
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	141 static void ParseAnonymizationRequest(Json::Value& request,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	142 DicomModification& target,
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	143 RestApiPostCall& call)
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	144 {
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	145 // 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	146
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	147 {
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	148 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	149 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	150 }
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	151
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	152 if (call.ParseJsonRequest(request) &&
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	153 request.isObject())
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	154 {
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	155 bool patientNameOverridden;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	156 target.ParseAnonymizationRequest(patientNameOverridden, request);
2518 63d2cc0fb40a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2517 diff changeset	157
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	158 if (!patientNameOverridden)
2518 63d2cc0fb40a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2517 diff changeset	159 {
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	160 // Override the random Patient's Name by one that is more
2518 63d2cc0fb40a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2517 diff changeset	161 // user-friendly (provided none was specified by the user)
63d2cc0fb40a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2517 diff changeset	162 target.Replace(DICOM_TAG_PATIENT_NAME, GeneratePatientName(OrthancRestApi::GetContext(call)), true);
63d2cc0fb40a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2517 diff changeset	163 }
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	164 }
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	165 else
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	166 {
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	167 throw OrthancException(ErrorCode_BadFileFormat);
d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	168 }
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	169 }
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	170
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	171
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	172 static void AnonymizeOrModifyInstance(DicomModification& modification,
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	173 RestApiPostCall& call,
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	174 bool transcode,
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	175 DicomTransferSyntax targetSyntax)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 {
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	177 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	178 std::string id = call.GetUriComponent("id", "");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	180 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	181
2825 8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	182 {
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	183 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	184 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	185 }
8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	186
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	187 modification.Apply(*modified);
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	188
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	189 if (transcode)
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	190 {
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	191 IDicomTranscoder::DicomImage source;
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	192 source.AcquireParsed(*modified); // "modified" is invalid below this point
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	193
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	194 IDicomTranscoder::DicomImage transcoded;
3903 d1273d7cc200 avoid unnecessary dicom serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3901 diff changeset	195
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	196 std::set<DicomTransferSyntax> s;
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	197 s.insert(targetSyntax);
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	198
3951 5fe8c6d3212e removed useless information "hasSopInstanceUidChanged" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3945 diff changeset	199 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	200 {
3945 0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	201 call.GetOutput().AnswerBuffer(transcoded.GetBufferData(),
0b3256c3ee14 simplified IDicomTranscoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3943 diff changeset	202 transcoded.GetBufferSize(), MimeType_Dicom);
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	203 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	204 else
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	205 {
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	206 throw OrthancException(ErrorCode_InternalError,
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	207 "Cannot transcode to transfer syntax: " +
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	208 std::string(GetTransferSyntaxUid(targetSyntax)));
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	209 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	210 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	211 else
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	212 {
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	213 modified->Answer(call.GetOutput());
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	214 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	218 static ResourceType DetectModifyLevel(const DicomModification& modification)
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 if (modification.IsReplaced(DICOM_TAG_PATIENT_ID))
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	221 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	222 return ResourceType_Patient;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	223 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	224 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	225 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	226 return ResourceType_Study;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	227 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	228 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	229 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	230 return ResourceType_Series;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	231 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	232 else
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	233 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	234 return ResourceType_Instance;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	235 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	236 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	237
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	238
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	239 static void ModifyInstance(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	241 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	242 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	243 DocumentModifyOptions(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	244 call.GetDocumentation()
4435 23ad1b9c7800 fix tag in openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4424 diff changeset	245 .SetTag("Instances")
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	246 .SetSummary("Modify instance")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	247 .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	248 "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	249 .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	250 .AddAnswerType(MimeType_Dicom, "The modified DICOM instance");
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	251 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	252 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	253
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	254 DicomModification modification;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	255 modification.SetAllowManualIdentifiers(true);
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	256
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	257 Json::Value request;
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	258 ParseModifyRequest(request, modification, call);
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	259
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	260 modification.SetLevel(DetectModifyLevel(modification));
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	261
3943 b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	262 if (request.isMember(TRANSCODE))
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	263 {
3943 b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	264 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	265
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	266 DicomTransferSyntax syntax;
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	267 if (LookupTransferSyntax(syntax, s))
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	268 {
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	269 AnonymizeOrModifyInstance(modification, call, true, syntax);
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	270 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	271 else
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	272 {
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	273 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	274 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	275 }
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	276 else
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	277 {
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	278 AnonymizeOrModifyInstance(modification, call, false /* no transcoding */,
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	279 DicomTransferSyntax_LittleEndianImplicit /* unused */);
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	280 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	284 static void AnonymizeInstance(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	286 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	287 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	288 DocumentAnonymizationOptions(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	289 call.GetDocumentation()
4435 23ad1b9c7800 fix tag in openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4424 diff changeset	290 .SetTag("Instances")
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	291 .SetSummary("Anonymize instance")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	292 .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	293 "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	294 .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	295 .AddAnswerType(MimeType_Dicom, "The anonymized DICOM instance");
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	296 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	297 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	298
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	299 DicomModification modification;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	300 modification.SetAllowManualIdentifiers(true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	302 Json::Value request;
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	303 ParseAnonymizationRequest(request, modification, call);
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	304
3901 603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	305 AnonymizeOrModifyInstance(modification, call, false /* no transcoding */,
603a7b86fa5f route "/instances/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3814 diff changeset	306 DicomTransferSyntax_LittleEndianImplicit /* unused */);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	310 static void SetKeepSource(CleaningInstancesJob& job,
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	311 const Json::Value& body)
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	312 {
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	313 if (body.isMember(KEEP_SOURCE))
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	314 {
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	315 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	316 }
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	317 }
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	318
5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	319
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	320 static void SubmitModificationJob(std::unique_ptr<DicomModification>& modification,
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	321 bool isAnonymization,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	322 RestApiPostCall& call,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	323 const Json::Value& body,
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	324 ResourceType outputLevel /* unused for multiple resources */,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	325 bool isSingleResource,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	326 const std::set<std::string>& resources)
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	327 {
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	328 ServerContext& context = OrthancRestApi::GetContext(call);
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	329
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	330 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	331
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	332 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	333 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	334 job->SetSingleResourceModification(modification.release(), outputLevel, isAnonymization);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	335 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	336 else
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	337 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	338 job->SetMultipleResourcesModification(modification.release(), isAnonymization);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	339 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	340
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	341 job->SetOrigin(call);
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	342 SetKeepSource(*job, body);
3943 b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	343
b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	344 if (body.isMember(TRANSCODE))
b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	345 {
b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	346 job->SetTranscode(SerializationToolbox::ReadString(body, TRANSCODE));
b26d25d3c1c7 "/{patients\|studies\|series}/.../modify": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3942 diff changeset	347 }
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	348
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	349 for (std::set<std::string>::const_iterator
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	350 it = resources.begin(); it != resources.end(); ++it)
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	351 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	352 context.AddChildInstances(job, it);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	353 }
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	354
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	355 job->AddTrailingStep();
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	356
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	357 OrthancRestApi::GetApi(call).SubmitCommandsJob
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	358 (call, job.release(), true /* synchronous by default */, body);
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	359 }
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	360
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	361
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	362 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	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 ResourceType outputLevel)
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	367 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	368 // 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	369 std::set<std::string> resources;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	370 resources.insert(call.GetUriComponent("id", ""));
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	371
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	372 SubmitModificationJob(modification, isAnonymization, call, body, outputLevel,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	373 true /* single resource */, resources);
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
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	376
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	377 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	378 bool isAnonymization,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	379 RestApiPostCall& call,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	380 const Json::Value& body)
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	381 {
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	382 std::set<std::string> resources;
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	383 SerializationToolbox::ReadSetOfStrings(resources, body, RESOURCES);
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	384
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	385 SubmitModificationJob(modification, isAnonymization,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	386 call, body, ResourceType_Instance /* arbitrary value, unused */,
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	387 false /* multiple resources */, resources);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	388 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	389
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	390
2639 75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	391 template <enum ResourceType resourceType>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	392 static void ModifyResource(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	394 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	395 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	396 OrthancRestApi::DocumentSubmitCommandsJob(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	397 DocumentModifyOptions(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	398 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	399 call.GetDocumentation()
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	400 .SetTag(GetResourceTypeText(resourceType, true /* plural /, true / upper case */))
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	401 .SetSummary("Modify " + r)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	402 .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	403 " 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	404 "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	405 "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	406 .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	407 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	408 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	409
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	410 std::unique_ptr<DicomModification> modification(new DicomModification);
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2639 diff changeset	411
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	412 Json::Value body;
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	413 ParseModifyRequest(body, *modification, call);
2517 d3d306bc4b99 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	414
2639 75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	415 modification->SetLevel(resourceType);
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	416
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	417 SubmitModificationJob(modification, false /* not an anonymization */,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	418 call, body, resourceType);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	421
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	422 // New in Orthanc 1.9.4
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	423 static void BulkModify(RestApiPostCall& call)
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 if (call.IsDocumentation())
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 OrthancRestApi::DocumentSubmitCommandsJob(call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	428 DocumentModifyOptions(call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	429 call.GetDocumentation()
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	430 .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	431 .SetSummary("Modify a set of resources")
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	432 .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	433 "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	434 .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	435 "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	436 .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	437 return;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	438 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	439
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	440 std::unique_ptr<DicomModification> modification(new DicomModification);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	441
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	442 Json::Value body;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	443 ParseModifyRequest(body, *modification, call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	444
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	445 modification->SetLevel(DetectModifyLevel(*modification));
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	446
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	447 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	448 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	449
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	450
2639 75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	451 template <enum ResourceType resourceType>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	452 static void AnonymizeResource(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	454 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	455 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	456 OrthancRestApi::DocumentSubmitCommandsJob(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	457 DocumentAnonymizationOptions(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	458 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	459 call.GetDocumentation()
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	460 .SetTag(GetResourceTypeText(resourceType, true /* plural /, true / upper case */))
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	461 .SetSummary("Anonymize " + r)
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	462 .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	463 " 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	464 "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	465 "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	466 .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	467 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	468 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	469
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	470 std::unique_ptr<DicomModification> modification(new DicomModification);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	471
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	472 Json::Value body;
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	473 ParseAnonymizationRequest(body, *modification, call);
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2639 diff changeset	474
2868 abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	475 SubmitModificationJob(modification, true /* anonymization */,
abce036683cd sharing code within OrthancRestAnonymizeModify Sebastien Jodogne <s.jodogne@gmail.com> parents: 2867 diff changeset	476 call, body, resourceType);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479
4693 45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	480 // New in Orthanc 1.9.4
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	481 static void BulkAnonymize(RestApiPostCall& call)
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 if (call.IsDocumentation())
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 OrthancRestApi::DocumentSubmitCommandsJob(call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	486 DocumentAnonymizationOptions(call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	487 call.GetDocumentation()
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	488 .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	489 .SetSummary("Anonymize a set of resources")
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	490 .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	491 "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	492 .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	493 "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	494 .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	495 return;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	496 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	497
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	498 std::unique_ptr<DicomModification> modification(new DicomModification);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	499
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	500 Json::Value body;
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	501 ParseAnonymizationRequest(body, *modification, call);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	502
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	503 SubmitBulkJob(modification, true /* anonymization */, call, body);
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	504 }
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	505
45bce660ce3a added routes for bulk anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	506
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	507 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	508 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	509 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	510 bool sendAnswer)
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	511 {
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4479 diff changeset	512 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	513 toStore->SetOrigin(DicomInstanceOrigin::FromRest(call));
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	514
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	515 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	516 StoreStatus status = context.Store(id, *toStore, StoreInstanceMode_Default);
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	517
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	518 if (status == StoreStatus_Failure)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	519 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	520 throw OrthancException(ErrorCode_CannotStoreInstance);
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	521 }
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	522
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	523 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	524 {
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4479 diff changeset	525 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	526 }
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	527 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	528
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	529
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	530 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	531 RestApiPostCall& call,
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	532 const Json::Value& request)
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	533 {
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	534 // 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	535 // 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	536
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	537 assert(request.isObject());
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	538 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	539
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	540 Json::Value::Members members = request.getMemberNames();
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	541 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	542 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	543 const std::string& name = members[i];
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	544 if (request[name].type() != Json::stringValue)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	545 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	546 throw OrthancException(ErrorCode_CreateDicomNotString);
1555 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 std::string value = request[name].asString();
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	550
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	551 DicomTag tag = FromDcmtkBridge::ParseTag(name);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	552 if (tag == DICOM_TAG_PIXEL_DATA)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	553 {
1562 2084b7c20478 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1558 diff changeset	554 dicom.EmbedContent(value);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	555 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	556 else
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	557 {
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	558 // 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	559 dicom.ReplacePlainString(tag, value);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	560 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	561 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	562 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	563
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	564
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	565 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	566 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	567 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	568 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	569 bool force)
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	570 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	571 if (tags.type() != Json::objectValue)
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	572 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	573 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	574 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	575
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	576 // Inject the user-specified tags
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	577 Json::Value::Members members = tags.getMemberNames();
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	578 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	579 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	580 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	581 DicomTag tag = FromDcmtkBridge::ParseTag(name);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	582
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	583 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	584 {
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	585 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	586 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	587 tag != DICOM_TAG_ACQUISITION_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	588 tag != DICOM_TAG_ACQUISITION_TIME &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	589 tag != DICOM_TAG_CONTENT_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	590 tag != DICOM_TAG_CONTENT_TIME &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	591 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	592 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	593 tag != DICOM_TAG_SERIES_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	594 tag != DICOM_TAG_SERIES_TIME &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	595 tag != DICOM_TAG_STUDY_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	596 tag != DICOM_TAG_STUDY_TIME &&
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	597 dicom.HasTag(tag))
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	598 {
2952 4ceb9bf7b00c added details string in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2936 diff changeset	599 throw OrthancException(ErrorCode_CreateDicomOverrideTag, name);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	600 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	601
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	602 if (tag == DICOM_TAG_PIXEL_DATA)
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	603 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	604 throw OrthancException(ErrorCode_CreateDicomUseContent);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	605 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	606 else
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	607 {
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	608 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	609 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	610 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	611 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	612 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	613
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	614
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	615 static void CreateSeries(RestApiPostCall& call,
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	616 ParsedDicomFile& base /* in */,
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	617 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	618 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	619 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	620 bool force)
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	621 {
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	622 assert(content.isArray());
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	623 assert(content.size() > 0);
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	624 ServerContext& context = OrthancRestApi::GetContext(call);
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	625
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	626 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	627 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	628
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	629 std::string someInstance;
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	630
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	631 try
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	632 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	633 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	634 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	635 std::unique_ptr<ParsedDicomFile> dicom(base.Clone(false));
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	636 const Json::Value* payload = NULL;
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	637
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	638 if (content[i].type() == Json::stringValue)
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	639 {
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	640 payload = &content[i];
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	641 }
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	642 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	643 {
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	644 if (!content[i].isMember(CONTENT))
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	645 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	646 throw OrthancException(ErrorCode_CreateDicomNoPayload);
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	647 }
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	648
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	649 payload = &content[i][CONTENT];
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	650
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	651 if (content[i].isMember(TAGS))
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	652 {
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	653 InjectTags(*dicom, content[i][TAGS], decodeBinaryTags, privateCreator, force);
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	654 }
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	655 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	656
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	657 if (payload == NULL \|\|
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	658 payload->type() != Json::stringValue)
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	659 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	660 throw OrthancException(ErrorCode_CreateDicomUseDataUriScheme);
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	661 }
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	662
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	663 dicom->EmbedContent(payload->asString());
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	664 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	665 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	666
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	667 StoreCreatedInstance(someInstance, call, *dicom, false);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	668 }
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	669 }
1616 644c32c07306 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	670 catch (OrthancException&)
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	671 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	672 // Error: Remove the newly-created series
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	673
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	674 std::string series;
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	675 if (context.GetIndex().LookupParent(series, someInstance))
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	676 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	677 Json::Value dummy;
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	678 context.GetIndex().DeleteResource(dummy, series, ResourceType_Series);
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	679 }
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	680
1616 644c32c07306 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	681 throw;
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	682 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	683
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	684 std::string series;
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	685 if (context.GetIndex().LookupParent(series, someInstance))
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	686 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	687 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	688 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	689 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	690
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	691
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	692 static void CreateDicomV2(RestApiPostCall& call,
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	693 const Json::Value& request)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	694 {
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	695 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	696 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	697 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	698
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	699 assert(request.isObject());
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	700 ServerContext& context = OrthancRestApi::GetContext(call);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	701
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	702 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	703 request[TAGS].type() != Json::objectValue)
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	704 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	705 throw OrthancException(ErrorCode_BadRequest);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	706 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	707
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1699 diff changeset	708 ParsedDicomFile dicom(true);
1558 124de28b32ed fix encodings of newly created dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	709
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	710 {
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	711 Encoding encoding;
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	712
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	713 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	714 {
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	715 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	716 if (!GetDicomEncoding(encoding, tmp))
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	717 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	718 throw OrthancException(ErrorCode_ParameterOutOfRange,
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	719 "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	720 }
1558 124de28b32ed fix encodings of newly created dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	721 }
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	722 else
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	723 {
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2361 diff changeset	724 encoding = GetDefaultDicomEncoding();
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	725 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	726
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	727 dicom.SetEncoding(encoding);
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	728 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	729
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	730 ResourceType parentType = ResourceType_Instance;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	731
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	732 if (request.isMember(PARENT))
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	733 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	734 // 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	735 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	736 if (!context.GetIndex().LookupResourceType(parentType, parent))
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	737 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	738 throw OrthancException(ErrorCode_CreateDicomBadParent);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	739 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	740
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	741 if (parentType == ResourceType_Instance)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	742 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	743 throw OrthancException(ErrorCode_CreateDicomParentIsInstance);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	744 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	745
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	746 // 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	747 // retrieve all its tags
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	748 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	749 std::string siblingInstanceId;
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	750
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 // 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	753 std::list<std::string> siblingInstances;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	754 context.GetIndex().GetChildInstances(siblingInstances, parent);
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 if (siblingInstances.empty())
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	757 {
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	758 // Error: No instance (should never happen)
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	759 throw OrthancException(ErrorCode_InternalError);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	760 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	761
3009 750de70b3603 make "/tools/create-dicom" more tolerant to invalid specific character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	762 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	763 context.ReadDicomAsJson(siblingTags, siblingInstanceId);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	764 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	765
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	766
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	767 // 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	768 {
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	769 static const char* const SPECIFIC_CHARACTER_SET = "0008,0005";
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	770
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	771 if (siblingTags.isMember(SPECIFIC_CHARACTER_SET))
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	772 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	773 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	774
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	775 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	776 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	777 !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	778 {
3009 750de70b3603 make "/tools/create-dicom" more tolerant to invalid specific character set Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	779 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	780 << "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	781 encoding = GetDefaultDicomEncoding();
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	782 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	783
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	784 dicom.SetEncoding(encoding);
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	785 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	786 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	787
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	788
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	789 // 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	790 typedef std::set<DicomTag> ModuleTags;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	791 ModuleTags moduleTags;
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 ResourceType type = parentType;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	794 for (;;)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	795 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	796 DicomTag::AddTagsForModule(moduleTags, GetModule(type));
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	797
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	798 if (type == ResourceType_Patient)
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 break; // We're done
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	801 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	802
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	803 // Go up
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	804 std::string tmp;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	805 if (!context.GetIndex().LookupParent(tmp, parent))
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	806 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	807 throw OrthancException(ErrorCode_InternalError);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	808 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	809
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	810 parent = tmp;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	811 type = GetParentResourceType(type);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	812 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	813
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	814 for (ModuleTags::const_iterator it = moduleTags.begin();
1616 644c32c07306 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	815 it != moduleTags.end(); ++it)
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	816 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	817 std::string t = it->Format();
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	818 if (siblingTags.isMember(t))
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	819 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	820 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	821 if (tag[TYPE] == "Null")
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	822 {
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	823 dicom.ReplacePlainString(*it, "");
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	824 }
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	825 else if (tag[TYPE] == "String")
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	826 {
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 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	828 dicom.ReplacePlainString(*it, value);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	829 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	830 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	831 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	832 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	833
1641 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 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	836 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	837 {
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	838 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	839 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	840 {
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	841 throw OrthancException(ErrorCode_BadRequest);
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	842 }
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	843
1689 26083d84d237 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1652 diff changeset	844 decodeBinaryTags = v.asBool();
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	845 }
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	846
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	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 // 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	849 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	850 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	851 {
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	852 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	853 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	854 {
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	855 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	856 }
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	857
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	858 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	859 }
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	860 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	861 {
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	862 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	863 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	864 }
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	865
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	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 // 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	868 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	869 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	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 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	872 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	873 {
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	874 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	875 }
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	876
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	877 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	878 }
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	879
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	880
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	881 // Inject time-related information
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	882 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	883 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	884 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	885 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	886 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	887 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	888 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	889 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	890
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	891 if (parentType == ResourceType_Patient \|\|
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	892 parentType == ResourceType_Study \|\|
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	893 parentType == ResourceType_Instance /* no parent */)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	894 {
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	895 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	896 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	897 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	898
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	899 if (parentType == ResourceType_Patient \|\|
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	900 parentType == ResourceType_Instance /* no parent */)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	901 {
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1934 diff changeset	902 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	903 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	904 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	905
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	906
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	907 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	908
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	909
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	910 // 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	911 if (request.isMember(CONTENT))
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	912 {
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	913 const Json::Value& content = request[CONTENT];
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	914
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	915 if (content.type() == Json::stringValue)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	916 {
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	917 dicom.EmbedContent(request[CONTENT].asString());
1564 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 if (content.type() == Json::arrayValue)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	921 {
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	922 if (content.size() > 0)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	923 {
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	924 // 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	925 CreateSeries(call, dicom, content, decodeBinaryTags, privateCreator, force);
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	926 return;
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	927 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	928 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	929 else
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	930 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	931 throw OrthancException(ErrorCode_CreateDicomUseDataUriScheme);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	932 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	933 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	934
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	935 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	936 StoreCreatedInstance(id, call, dicom, true);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	937 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	938
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	939
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	940 static void CreateDicom(RestApiPostCall& call)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	941 {
4422 48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	942 if (call.IsDocumentation())
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	943 {
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	944 call.GetDocumentation()
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	945 .SetTag("System")
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	946 .SetSummary("Create one DICOM instance")
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	947 .SetDescription("Create one DICOM instance, and store it into Orthanc")
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	948 .SetRequestField(TAGS, RestApiCallDocumentation::Type_JsonObject,
4422 48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	949 "Associative array containing the tags of the new instance to be created", true)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	950 .SetRequestField(CONTENT, RestApiCallDocumentation::Type_String,
4422 48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	951 "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	952 "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	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 "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	955 "containing one DICOM instance for each item in the `Content` field.", false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	956 .SetRequestField(PARENT, RestApiCallDocumentation::Type_String,
4422 48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	957 "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	958 "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	959 "modules in the DICOM hierarchy will be automatically copied to the newly created instance.", false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	960 .SetRequestField(INTERPRET_BINARY_TAGS, RestApiCallDocumentation::Type_Boolean,
4422 48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	961 "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	962 "[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	963 "whether this value is decoded to a binary value or kept as such (`true` by default)", false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	964 .SetRequestField(PRIVATE_CREATOR, RestApiCallDocumentation::Type_String,
4422 48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	965 "The private creator to be used for private tags in `Tags`", false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	966 .SetRequestField(FORCE, RestApiCallDocumentation::Type_Boolean,
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	967 "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	968 "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	969 "`SeriesInstanceUID`, or `SOPInstanceUID`. Be careful with this feature.", false)
4422 48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	970 .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	971 .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	972 return;
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	973 }
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	974
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	975 Json::Value request;
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	976 if (!call.ParseJsonRequest(request) \|\|
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	977 !request.isObject())
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	978 {
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	979 throw OrthancException(ErrorCode_BadRequest);
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	980 }
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	981
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	982 if (request.isMember(TAGS))
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	983 {
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	984 CreateDicomV2(call, request);
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	985 }
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	986 else
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	987 {
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	988 // Compatibility with Orthanc <= 0.9.3
1805 f08978b1f45b c-find scu for modality worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1699 diff changeset	989 ParsedDicomFile dicom(true);
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	990 CreateDicomV1(dicom, call, request);
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	991
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	992 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	993 StoreCreatedInstance(id, call, dicom, true);
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	994 }
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	995 }
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	996
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	997
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	998 static void SplitStudy(RestApiPostCall& call)
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	999 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1000 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1001 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1002 OrthancRestApi::DocumentSubmitCommandsJob(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1003 call.GetDocumentation()
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1004 .SetTag("Studies")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1005 .SetSummary("Split study")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1006 .SetDescription("Start a new job so as to split the DICOM study whose Orthanc identifier is provided in the URL, "
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1007 "by taking some of its children series or instances out of it and putting them into a brand new study "
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1008 "(this new study is created by setting the `StudyInstanceUID` tag to a random identifier): "
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1009 "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	1010 .SetUriArgument("id", "Orthanc identifier of the study of interest")
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1011 .SetRequestField(SERIES, RestApiCallDocumentation::Type_JsonListOfStrings,
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1012 "The list of series to be separated from the parent study. "
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1013 "These series must all be children of the same source study, that is specified in the URI.", false)
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1014 .SetRequestField(REPLACE, RestApiCallDocumentation::Type_JsonObject,
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1015 "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	1016 "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	1017 "Module Attributes\", as specified by the DICOM 2011 standard in Tables C.7-1 and C.7-3.", false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1018 .SetRequestField(REMOVE, RestApiCallDocumentation::Type_JsonListOfStrings,
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1019 "List of tags that must be removed in the new study (from the same modules as in the `Replace` option)", false)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1020 .SetRequestField(KEEP_SOURCE, RestApiCallDocumentation::Type_Boolean,
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1021 "If set to `true`, instructs Orthanc to keep a copy of the original series/instances in the source study. "
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1022 "By default, the original series/instances are deleted from Orthanc.", false)
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1023 .SetRequestField(INSTANCES, RestApiCallDocumentation::Type_JsonListOfStrings,
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1024 "The list of instances to be separated from the parent study. "
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1025 "These instances must all be children of the same source study, that is specified in the URI.", false);
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1026 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1027 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1028
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1029 ServerContext& context = OrthancRestApi::GetContext(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 Json::Value request;
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1032 if (!call.ParseJsonRequest(request))
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 // Bad JSON request
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1035 throw OrthancException(ErrorCode_BadFileFormat);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1036 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1037
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1038 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	1039
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	1040 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	1041 job->SetOrigin(call);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1042
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1043 bool ok = false;
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1044 if (request.isMember(SERIES))
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1045 {
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1046 std::vector<std::string> series;
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1047 SerializationToolbox::ReadArrayOfStrings(series, request, SERIES);
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1048
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1049 for (size_t i = 0; i < series.size(); i++)
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1050 {
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1051 job->AddSourceSeries(series[i]);
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1052 ok = true;
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1053 }
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1054 }
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1055
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1056 if (request.isMember(INSTANCES))
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1057 {
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1058 std::vector<std::string> instances;
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1059 SerializationToolbox::ReadArrayOfStrings(instances, request, INSTANCES);
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1060
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1061 for (size_t i = 0; i < instances.size(); i++)
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1062 {
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1063 job->AddSourceInstance(instances[i]);
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1064 ok = true;
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1065 }
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1066 }
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1067
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1068 if (!ok)
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1069 {
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1070 throw OrthancException(ErrorCode_BadRequest, "Both the \"Series\" and the \"Instances\" fields are missing");
bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1071 }
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	1072
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1073 job->AddTrailingStep();
8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1074
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	1075 SetKeepSource(*job, request);
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1076
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1077 if (request.isMember(REMOVE))
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1078 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1079 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	1080 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1081 throw OrthancException(ErrorCode_BadFileFormat);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1082 }
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 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	1085 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1086 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	1087 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1088 throw OrthancException(ErrorCode_BadFileFormat);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1089 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1090 else
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 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	1093 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1094 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1095 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1096
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1097 if (request.isMember(REPLACE))
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1098 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1099 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	1100 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1101 throw OrthancException(ErrorCode_BadFileFormat);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1102 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1103
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1104 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	1105
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1106 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	1107 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1108 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	1109
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1110 if (value.type() != Json::stringValue)
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1111 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1112 throw OrthancException(ErrorCode_BadFileFormat);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1113 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1114 else
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1115 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1116 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	1117 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1118 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1119 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1120
2869 2bd87764709c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1121 OrthancRestApi::GetApi(call).SubmitCommandsJob
2bd87764709c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1122 (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	1123 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1124
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1125
2853 52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1126 static void MergeStudy(RestApiPostCall& call)
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1127 {
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1128 if (call.IsDocumentation())
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1129 {
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1130 OrthancRestApi::DocumentSubmitCommandsJob(call);
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1131 call.GetDocumentation()
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1132 .SetTag("Studies")
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1133 .SetSummary("Merge study")
4715 fb98db281d1d "/studies/{id}/merge" accepts instances inside its "Resources" parameter Sebastien Jodogne <s.jodogne@gmail.com> parents: 4712 diff changeset	1134 .SetDescription("Start a new job so as to move some DICOM resources into the DICOM study whose Orthanc identifier "
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1135 "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	1136 .SetUriArgument("id", "Orthanc identifier of the study of interest")
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1137 .SetRequestField(RESOURCES, RestApiCallDocumentation::Type_JsonListOfStrings,
4715 fb98db281d1d "/studies/{id}/merge" accepts instances inside its "Resources" parameter Sebastien Jodogne <s.jodogne@gmail.com> parents: 4712 diff changeset	1138 "The list of DICOM resources (studies, series, and/or instances) to be merged "
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1139 "into the study of interest (mandatory option)", true)
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1140 .SetRequestField(KEEP_SOURCE, RestApiCallDocumentation::Type_Boolean,
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1141 "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	1142 "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	1143 return;
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1144 }
83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1145
2853 52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1146 ServerContext& context = OrthancRestApi::GetContext(call);
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1147
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1148 Json::Value request;
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1149 if (!call.ParseJsonRequest(request))
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1150 {
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1151 // Bad JSON request
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1152 throw OrthancException(ErrorCode_BadFileFormat);
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1153 }
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1154
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1155 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	1156
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	1157 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	1158 job->SetOrigin(call);
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1159
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1160 std::vector<std::string> resources;
4712 bad8935cd5f2 "/studies/{id}/split" accepts "Instances" parameter to split instances instead of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	1161 SerializationToolbox::ReadArrayOfStrings(resources, request, RESOURCES);
2853 52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1162
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1163 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	1164 {
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1165 job->AddSource(resources[i]);
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1166 }
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1167
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1168 job->AddTrailingStep();
8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1169
3942 5b882ad2ffd0 "/{patients\|studies\|series}/.../modify": New option "KeepSource" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3930 diff changeset	1170 SetKeepSource(*job, request);
2853 52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1171
2869 2bd87764709c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1172 OrthancRestApi::GetApi(call).SubmitCommandsJob
2bd87764709c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1173 (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	1174 }
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1175
52b017d22a4f New URI: "/studies/.../merge" to merge a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1176
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1177 void OrthancRestApi::RegisterAnonymizeModify()
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1178 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1179 Register("/instances/{id}/modify", ModifyInstance);
2639 75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1180 Register("/series/{id}/modify", ModifyResource<ResourceType_Series>);
75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1181 Register("/studies/{id}/modify", ModifyResource<ResourceType_Study>);
75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1182 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	1183 Register("/tools/bulk-modify", BulkModify);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1184
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1185 Register("/instances/{id}/anonymize", AnonymizeInstance);
2639 75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1186 Register("/series/{id}/anonymize", AnonymizeResource<ResourceType_Series>);
75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1187 Register("/studies/{id}/anonymize", AnonymizeResource<ResourceType_Study>);
75a404e40323 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	1188 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	1189 Register("/tools/bulk-anonymize", BulkAnonymize);
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	1190
1120 009dce4ea2f6 /tools/create-dicom now accepts PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	1191 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	1192
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	1193 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	1194 Register("/studies/{id}/merge", MergeStudy);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1195 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1196 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 4723:4b721432fa67 openssl-3.x