orthanc: OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp annotate

annotate OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 1645:1558b3226b18

IHttpExceptionFormatter

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 24 Sep 2015 15:55:17 +0200
parents	4e56b5a206b7
children	69f7822ee254

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
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1279 diff changeset	3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1279 diff changeset	4 * Department, University Hospital of Liege, Belgium
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * This program is free software: you can redistribute it and/or
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * 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	8 * published by the Free Software Foundation, either version 3 of the
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * License, or (at your option) any later version.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * In addition, as a special exception, the copyright holders of this
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * program give permission to link the code of its release with the
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * that use the same license as the "OpenSSL" library), and distribute
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * the linked executables. You must obey the GNU General Public License
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * in all respects for all of the code used other than "OpenSSL". If you
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * modify file(s) with this exception, you may extend this exception to
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * your version of the file(s), but you are not obligated to do so. If
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * you do not wish to do so, delete this exception statement from your
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * version. If you delete this exception statement from all source files
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * in the program, then also delete it here.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * 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	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * 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	29 * 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	30 **/
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	33 #include "../PrecompiledHeadersServer.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "OrthancRestApi.h"
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	36 #include "../../Core/Logging.h"
f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	37 #include "../../Core/Uuid.h"
795 d466b3606aca refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 791 diff changeset	38 #include "../FromDcmtkBridge.h"
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	39 #include "../ServerContext.h"
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	40 #include "../OrthancInitialization.h"
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	41
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	42 #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	43 #include <boost/algorithm/string/predicate.hpp>
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	44
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 namespace Orthanc
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 // Modification of DICOM instances ------------------------------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	49 enum TagOperation
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 {
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	51 TagOperation_Keep,
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	52 TagOperation_Remove
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	53 };
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	55 static void ParseListOfTags(DicomModification& target,
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	56 const Json::Value& query,
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	57 TagOperation operation)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 {
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	59 if (!query.isArray())
751 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 throw OrthancException(ErrorCode_BadRequest);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	64 for (Json::Value::ArrayIndex i = 0; i < query.size(); i++)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 {
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	66 std::string name = query[i].asString();
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	67
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 DicomTag tag = FromDcmtkBridge::ParseTag(name);
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	69
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	70 switch (operation)
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	71 {
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	72 case TagOperation_Keep:
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	73 target.Keep(tag);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	74 VLOG(1) << "Keep: " << name << " " << tag << std::endl;
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	75 break;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	77 case TagOperation_Remove:
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	78 target.Remove(tag);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	79 VLOG(1) << "Remove: " << name << " " << tag << std::endl;
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	80 break;
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	81
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	82 default:
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	83 throw OrthancException(ErrorCode_InternalError);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	84 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	89 static void ParseReplacements(DicomModification& target,
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 const Json::Value& replacements)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 if (!replacements.isObject())
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94 throw OrthancException(ErrorCode_BadRequest);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97 Json::Value::Members members = replacements.getMemberNames();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 for (size_t i = 0; i < members.size(); i++)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 const std::string& name = members[i];
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101 std::string value = replacements[name].asString();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	103 DicomTag tag = FromDcmtkBridge::ParseTag(name);
800 ecedd89055db generation of DICOM images from PNG files Sebastien Jodogne <s.jodogne@gmail.com> parents: 796 diff changeset	104 target.Replace(tag, value);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	106 VLOG(1) << "Replace: " << name << " " << tag << " == " << value << std::endl;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 static std::string GeneratePatientName(ServerContext& context)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	113 uint64_t seq = context.GetIndex().IncrementGlobalSequence(GlobalProperty_AnonymizationSequence);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114 return "Anonymized" + boost::lexical_cast<std::string>(seq);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	115 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	118
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	119 bool OrthancRestApi::ParseModifyRequest(DicomModification& target,
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	120 const Json::Value& request)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 {
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	122 if (request.isObject())
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 {
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	124 if (request.isMember("RemovePrivateTags"))
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	125 {
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	126 target.SetRemovePrivateTags(true);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	127 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129 if (request.isMember("Remove"))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 {
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	131 ParseListOfTags(target, request["Remove"], TagOperation_Remove);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 if (request.isMember("Replace"))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 {
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	136 ParseReplacements(target, request["Replace"]);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 return true;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141 else
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 return false;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147
1010 160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	148 static bool ParseModifyRequest(DicomModification& target,
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	149 const RestApiPostCall& call)
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	150 {
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	151 // curl http://localhost:8042/series/95a6e2bf-9296e2cc-bf614e2f-22b391ee-16e010e0/modify -X POST -d '{"Replace":{"InstitutionName":"My own clinic"}}'
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	152
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	153 Json::Value request;
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	154 if (call.ParseJsonRequest(request))
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	155 {
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	156 return OrthancRestApi::ParseModifyRequest(target, request);
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	157 }
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	158 else
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	159 {
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	160 return false;
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	161 }
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	162 }
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	163
160dfe770618 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 diff changeset	164
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	165 static bool ParseAnonymizationRequest(DicomModification& target,
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	166 RestApiPostCall& call)
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	167 {
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	168 // curl http://localhost:8042/instances/6e67da51-d119d6ae-c5667437-87b9a8a5-0f07c49f/anonymize -X POST -d '{"Replace":{"PatientName":"hello","0010-0020":"world"},"Keep":["StudyDescription", "SeriesDescription"],"KeepPrivateTags": null,"Remove":["Modality"]}' > Anonymized.dcm
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 target.SetupAnonymization();
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	171 std::string patientName = target.GetReplacement(DICOM_TAG_PATIENT_NAME);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	172
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	173 Json::Value request;
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	174 if (call.ParseJsonRequest(request) && request.isObject())
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	175 {
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	176 if (request.isMember("KeepPrivateTags"))
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	177 {
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	178 target.SetRemovePrivateTags(false);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	179 }
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	180
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	181 if (request.isMember("Remove"))
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	182 {
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	183 ParseListOfTags(target, request["Remove"], TagOperation_Remove);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	184 }
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	185
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	186 if (request.isMember("Replace"))
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	187 {
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	188 ParseReplacements(target, request["Replace"]);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	189 }
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	190
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	191 if (request.isMember("Keep"))
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	192 {
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	193 ParseListOfTags(target, request["Keep"], TagOperation_Keep);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	194 }
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	195
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	196 if (target.IsReplaced(DICOM_TAG_PATIENT_NAME) &&
2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	197 target.GetReplacement(DICOM_TAG_PATIENT_NAME) == patientName)
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	198 {
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	199 // Overwrite the random Patient's Name by one that is more
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	200 // user-friendly (provided none was specified by the user)
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	201 target.Replace(DICOM_TAG_PATIENT_NAME, GeneratePatientName(OrthancRestApi::GetContext(call)), true);
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	202 }
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	203
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	204 return true;
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	205 }
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	206 else
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	207 {
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	208 return false;
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	209 }
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	210 }
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	211
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	212
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	213 static void AnonymizeOrModifyInstance(DicomModification& modification,
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	214 RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 {
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	216 std::string id = call.GetUriComponent("id", "");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	218 ServerContext::DicomCacheLocker locker(OrthancRestApi::GetContext(call), id);
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	219
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	220 std::auto_ptr<ParsedDicomFile> modified(locker.GetDicom().Clone());
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	221 modification.Apply(*modified);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 modified->Answer(call.GetOutput());
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	226 static void AnonymizeOrModifyResource(DicomModification& modification,
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 MetadataType metadataType,
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 ChangeType changeType,
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 ResourceType resourceType,
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	230 RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 bool isFirst = true;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 Json::Value result(Json::objectValue);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	237 typedef std::list<std::string> Instances;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 Instances instances;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 std::string id = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 context.GetIndex().GetChildInstances(instances, id);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 if (instances.empty())
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	247
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 /**
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 * Loop over all the instances of the resource.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 **/
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 for (Instances::const_iterator it = instances.begin();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 it != instances.end(); ++it)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 LOG(INFO) << "Modifying instance " << *it;
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	256
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	257 std::auto_ptr<ServerContext::DicomCacheLocker> locker;
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	258
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	259 try
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	260 {
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	261 locker.reset(new ServerContext::DicomCacheLocker(OrthancRestApi::GetContext(call), *it));
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	262 }
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	263 catch (OrthancException&)
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	264 {
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	265 // This child instance has been removed in between
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	266 continue;
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	267 }
aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	268
1129 8dabdc0d3007 fix possible deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 1120 diff changeset	269
778 aebf0071020e refactoring of the mutex for the dicom cache Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	270 ParsedDicomFile& original = locker->GetDicom();
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 DicomInstanceHasher originalHasher = original.GetHasher();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 /**
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	275 * Compute the resulting DICOM instance.
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276 **/
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 std::auto_ptr<ParsedDicomFile> modified(original.Clone());
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	279 modification.Apply(*modified);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	281 DicomInstanceToStore toStore;
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	282 toStore.SetRestOrigin(call);
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	283 toStore.SetParsedDicomFile(*modified);
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	284
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	285
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	286 /**
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	287 * Prepare the metadata information to associate with the
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	288 * resulting DICOM instance (AnonymizedFrom/ModifiedFrom).
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	289 **/
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	290
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	291 DicomInstanceHasher modifiedHasher = modified->GetHasher();
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	292
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	293 if (originalHasher.HashSeries() != modifiedHasher.HashSeries())
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	294 {
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	295 toStore.AddMetadata(ResourceType_Series, metadataType, originalHasher.HashSeries());
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	296 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	297
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	298 if (originalHasher.HashStudy() != modifiedHasher.HashStudy())
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	299 {
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	300 toStore.AddMetadata(ResourceType_Study, metadataType, originalHasher.HashStudy());
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	301 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	302
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	303 if (originalHasher.HashPatient() != modifiedHasher.HashPatient())
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	304 {
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	305 toStore.AddMetadata(ResourceType_Patient, metadataType, originalHasher.HashPatient());
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	306 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	307
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	308 assert(*it == originalHasher.HashInstance());
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	309 toStore.AddMetadata(ResourceType_Instance, metadataType, *it);
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	310
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	311
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	312 /**
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	313 * Store the resulting DICOM instance into the Orthanc store.
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	314 **/
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	315
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316 std::string modifiedInstance;
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	317 if (context.Store(modifiedInstance, toStore) != StoreStatus_Success)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	319 LOG(ERROR) << "Error while storing a modified instance " << *it;
bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	320 throw OrthancException(ErrorCode_CannotStoreInstance);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	323 // Sanity checks in debug mode
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 assert(modifiedInstance == modifiedHasher.HashInstance());
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 /**
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328 * Compute the JSON object that is returned by the REST call.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 **/
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331 if (isFirst)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333 std::string newId;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 switch (resourceType)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337 case ResourceType_Series:
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338 newId = modifiedHasher.HashSeries();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339 break;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341 case ResourceType_Study:
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 newId = modifiedHasher.HashStudy();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 break;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 case ResourceType_Patient:
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 newId = modifiedHasher.HashPatient();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 break;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 default:
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 throw OrthancException(ErrorCode_InternalError);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 result["Type"] = EnumerationToString(resourceType);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 result["ID"] = newId;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 result["Path"] = GetBasePath(resourceType, newId);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 result["PatientID"] = modifiedHasher.HashPatient();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 isFirst = false;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	366 static void ModifyInstance(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 {
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	368 throw OrthancException(ErrorCode_CannotStoreInstance);
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1641 diff changeset	369
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	370 DicomModification modification;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	371 modification.SetAllowManualIdentifiers(true);
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	372
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	373 if (ParseModifyRequest(modification, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374 {
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	375 if (modification.IsReplaced(DICOM_TAG_PATIENT_ID))
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	376 {
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	377 modification.SetLevel(ResourceType_Patient);
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	378 }
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	379 else if (modification.IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	380 {
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	381 modification.SetLevel(ResourceType_Study);
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	382 }
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	383 else if (modification.IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	384 {
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	385 modification.SetLevel(ResourceType_Series);
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	386 }
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	387 else
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	388 {
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	389 modification.SetLevel(ResourceType_Instance);
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	390 }
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	391
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	392 AnonymizeOrModifyInstance(modification, call);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	397 static void AnonymizeInstance(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 {
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	399 DicomModification modification;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	400 modification.SetAllowManualIdentifiers(true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	402 if (ParseAnonymizationRequest(modification, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 {
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	404 AnonymizeOrModifyInstance(modification, call);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	409 template <enum ChangeType changeType,
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	410 enum ResourceType resourceType>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	411 static void ModifyResource(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 {
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	413 DicomModification modification;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	415 if (ParseModifyRequest(modification, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416 {
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	417 modification.SetLevel(resourceType);
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	418 AnonymizeOrModifyResource(modification, MetadataType_ModifiedFrom,
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	419 changeType, resourceType, call);
751 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 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	423
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	424 template <enum ChangeType changeType,
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	425 enum ResourceType resourceType>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	426 static void AnonymizeResource(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	427 {
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	428 DicomModification modification;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	429
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	430 if (ParseAnonymizationRequest(modification, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431 {
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	432 AnonymizeOrModifyResource(modification, MetadataType_AnonymizedFrom,
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	433 changeType, resourceType, call);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	437
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	438 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	439 RestApiPostCall& call,
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	440 ParsedDicomFile& dicom)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	441 {
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	442 DicomInstanceToStore toStore;
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	443 toStore.SetRestOrigin(call);
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	444 toStore.SetParsedDicomFile(dicom);
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	445
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	446 ServerContext& context = OrthancRestApi::GetContext(call);
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	447 StoreStatus status = context.Store(id, toStore);
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	448
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	449 if (status == StoreStatus_Failure)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	450 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	451 throw OrthancException(ErrorCode_CannotStoreInstance);
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	452 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	453 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	454
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	455
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	456 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	457 RestApiPostCall& call,
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	458 const Json::Value& request)
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	459 {
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	460 // 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	461 // 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	462
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	463 assert(request.isObject());
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	464 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	465
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	466 Json::Value::Members members = request.getMemberNames();
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	467 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	468 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	469 const std::string& name = members[i];
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	470 if (request[name].type() != Json::stringValue)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	471 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	472 throw OrthancException(ErrorCode_CreateDicomNotString);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	473 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	474
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	475 std::string value = request[name].asString();
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	476
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	477 DicomTag tag = FromDcmtkBridge::ParseTag(name);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	478 if (tag == DICOM_TAG_PIXEL_DATA)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	479 {
1562 2084b7c20478 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1558 diff changeset	480 dicom.EmbedContent(value);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	481 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	482 else
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	483 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	484 dicom.Replace(tag, value);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	485 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	486 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	487 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	488
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	489
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	490 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	491 const Json::Value& tags,
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	492 bool interpretBinaryTags)
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	493 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	494 if (tags.type() != Json::objectValue)
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	495 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	496 throw OrthancException(ErrorCode_BadRequest);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	497 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	498
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	499 // Inject the user-specified tags
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	500 Json::Value::Members members = tags.getMemberNames();
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	501 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	502 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	503 const std::string& name = members[i];
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	504 if (tags[name].type() != Json::stringValue)
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	505 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	506 throw OrthancException(ErrorCode_CreateDicomNotString);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	507 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	508
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	509 std::string value = tags[name].asString();
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	510 DicomTag tag = FromDcmtkBridge::ParseTag(name);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	511
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	512 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	513 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	514 if (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	515 tag != DICOM_TAG_ACQUISITION_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	516 tag != DICOM_TAG_ACQUISITION_TIME &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	517 tag != DICOM_TAG_CONTENT_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	518 tag != DICOM_TAG_CONTENT_TIME &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	519 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	520 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	521 tag != DICOM_TAG_SERIES_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	522 tag != DICOM_TAG_SERIES_TIME &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	523 tag != DICOM_TAG_STUDY_DATE &&
48224db51ee7 allow override date/time when creating DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1616 diff changeset	524 tag != DICOM_TAG_STUDY_TIME &&
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	525 dicom.HasTag(tag))
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	526 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	527 throw OrthancException(ErrorCode_CreateDicomOverrideTag);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	528 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	529
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	530 if (tag == DICOM_TAG_PIXEL_DATA)
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	531 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	532 throw OrthancException(ErrorCode_CreateDicomUseContent);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	533 }
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	534 else if (interpretBinaryTags &&
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	535 boost::starts_with(value, "data:application/octet-stream;base64,"))
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	536 {
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	537 std::string mime, binary;
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	538 Toolbox::DecodeDataUriScheme(mime, binary, value);
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	539 dicom.Replace(tag, binary);
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	540 }
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	541 else
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	542 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	543 dicom.Replace(tag, Toolbox::ConvertFromUtf8(value, dicom.GetEncoding()));
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	544 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	545 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	546 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	547 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	548
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	549
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	550 static void CreateSeries(RestApiPostCall& call,
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	551 ParsedDicomFile& base /* in */,
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	552 const Json::Value& content,
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	553 bool interpretBinaryTags)
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	554 {
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	555 assert(content.isArray());
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	556 assert(content.size() > 0);
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	557 ServerContext& context = OrthancRestApi::GetContext(call);
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	558
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	559 base.Replace(DICOM_TAG_IMAGES_IN_ACQUISITION, boost::lexical_cast<std::string>(content.size()));
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	560 base.Replace(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS, "1");
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	561
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	562 std::string someInstance;
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	563
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	564 try
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	565 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	566 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	567 {
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	568 std::auto_ptr<ParsedDicomFile> dicom(base.Clone());
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	569 const Json::Value* payload = NULL;
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	570
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	571 if (content[i].type() == Json::stringValue)
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	572 {
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	573 payload = &content[i];
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	574 }
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	575 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	576 {
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	577 if (!content[i].isMember("Content"))
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	578 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	579 throw OrthancException(ErrorCode_CreateDicomNoPayload);
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	580 }
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	581
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	582 payload = &content[i]["Content"];
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	583
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	584 if (content[i].isMember("Tags"))
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	585 {
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	586 InjectTags(*dicom, content[i]["Tags"], interpretBinaryTags);
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	587 }
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	588 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	589
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	590 if (payload == NULL \|\|
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	591 payload->type() != Json::stringValue)
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	592 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	593 throw OrthancException(ErrorCode_CreateDicomUseDataUriScheme);
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	594 }
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	595
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	596 dicom->EmbedContent(payload->asString());
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	597 dicom->Replace(DICOM_TAG_INSTANCE_NUMBER, boost::lexical_cast<std::string>(i + 1));
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	598 dicom->Replace(DICOM_TAG_IMAGE_INDEX, boost::lexical_cast<std::string>(i + 1));
3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	599
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	600 StoreCreatedInstance(someInstance, call, *dicom);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	601 }
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	602 }
1616 644c32c07306 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	603 catch (OrthancException&)
1566 3be6eb3757c8 error handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1565 diff changeset	604 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	605 // Error: Remove the newly-created series
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	606
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	607 std::string series;
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	608 if (context.GetIndex().LookupParent(series, someInstance))
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	609 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	610 Json::Value dummy;
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	611 context.GetIndex().DeleteResource(dummy, series, ResourceType_Series);
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	612 }
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	613
1616 644c32c07306 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	614 throw;
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	615 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	616
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	617 std::string series;
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	618 if (context.GetIndex().LookupParent(series, someInstance))
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	619 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	620 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	621 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	622 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	623
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	624
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	625 static void CreateDicomV2(RestApiPostCall& call,
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	626 const Json::Value& request)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	627 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	628 assert(request.isObject());
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	629 ServerContext& context = OrthancRestApi::GetContext(call);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	630
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	631 if (!request.isMember("Tags") \|\|
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	632 request["Tags"].type() != Json::objectValue)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	633 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	634 throw OrthancException(ErrorCode_BadRequest);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	635 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	636
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	637 ParsedDicomFile dicom;
1558 124de28b32ed fix encodings of newly created dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	638
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	639 {
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	640 Encoding encoding;
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	641
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	642 if (request["Tags"].isMember("SpecificCharacterSet"))
1558 124de28b32ed fix encodings of newly created dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	643 {
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	644 const char* tmp = request["Tags"]["SpecificCharacterSet"].asCString();
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	645 if (!GetDicomEncoding(encoding, tmp))
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	646 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	647 LOG(ERROR) << "Unknown specific character set: " << std::string(tmp);
bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	648 throw OrthancException(ErrorCode_ParameterOutOfRange);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	649 }
1558 124de28b32ed fix encodings of newly created dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1557 diff changeset	650 }
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	651 else
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	652 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	653 std::string tmp = Configuration::GetGlobalStringParameter("DefaultEncoding", "Latin1");
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	654 encoding = StringToEncoding(tmp.c_str());
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
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	657 dicom.SetEncoding(encoding);
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	658 }
ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	659
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	660 ResourceType parentType = ResourceType_Instance;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	661
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	662 if (request.isMember("Parent"))
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	663 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	664 // Locate the parent tags
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	665 std::string parent = request["Parent"].asString();
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	666 if (!context.GetIndex().LookupResourceType(parentType, parent))
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	667 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	668 throw OrthancException(ErrorCode_CreateDicomBadParent);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	669 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	670
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	671 if (parentType == ResourceType_Instance)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	672 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	673 throw OrthancException(ErrorCode_CreateDicomParentIsInstance);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	674 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	675
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	676 // 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	677 // retrieve all its tags
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	678 Json::Value siblingTags;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	679
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	680 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	681 // 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	682 std::list<std::string> siblingInstances;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	683 context.GetIndex().GetChildInstances(siblingInstances, parent);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	684
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	685 if (siblingInstances.empty())
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	686 {
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	687 // Error: No instance (should never happen)
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	688 throw OrthancException(ErrorCode_InternalError);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	689 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	690
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	691 context.ReadJson(siblingTags, siblingInstances.front());
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	692 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	693
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	694
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	695 // 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	696 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	697 static const char* SPECIFIC_CHARACTER_SET = "0008,0005";
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	698
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	699 if (siblingTags.isMember(SPECIFIC_CHARACTER_SET))
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	700 {
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	701 Encoding encoding;
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	702 if (!siblingTags[SPECIFIC_CHARACTER_SET].isMember("Value") \|\|
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	703 siblingTags[SPECIFIC_CHARACTER_SET]["Value"].type() != Json::stringValue \|\|
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	704 !GetDicomEncoding(encoding, siblingTags[SPECIFIC_CHARACTER_SET]["Value"].asCString()))
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	705 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	706 throw OrthancException(ErrorCode_CreateDicomParentEncoding);
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	707 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	708
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	709 dicom.SetEncoding(encoding);
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	710 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	711 }
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	712
4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	713
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	714 // 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	715 typedef std::set<DicomTag> ModuleTags;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	716 ModuleTags moduleTags;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	717
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	718 ResourceType type = parentType;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	719 for (;;)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	720 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	721 DicomTag::AddTagsForModule(moduleTags, GetModule(type));
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	722
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	723 if (type == ResourceType_Patient)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	724 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	725 break; // We're done
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	726 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	727
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	728 // Go up
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	729 std::string tmp;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	730 if (!context.GetIndex().LookupParent(tmp, parent))
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	731 {
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	732 throw OrthancException(ErrorCode_InternalError);
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
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	735 parent = tmp;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	736 type = GetParentResourceType(type);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	737 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	738
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	739 for (ModuleTags::const_iterator it = moduleTags.begin();
1616 644c32c07306 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	740 it != moduleTags.end(); ++it)
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	741 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	742 std::string t = it->Format();
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	743 if (siblingTags.isMember(t))
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 const Json::Value& tag = siblingTags[t];
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	746 if (tag["Type"] == "Null")
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	747 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	748 dicom.Replace(*it, "");
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	749 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	750 else if (tag["Type"] == "String")
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	751 {
1557 ad1e127b4ed5 fix in encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	752 std::string value = tag["Value"].asString();
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	753 dicom.Replace(*it, Toolbox::ConvertFromUtf8(value, dicom.GetEncoding()));
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	754 }
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 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	757 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	758
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	759
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	760 bool interpretBinaryTags = true;
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	761 if (request.isMember("InterpretBinaryTags"))
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	762 {
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	763 const Json::Value& v = request["InterpretBinaryTags"];
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	764 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	765 {
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	766 throw OrthancException(ErrorCode_BadRequest);
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	767 }
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	768
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	769 interpretBinaryTags = v.asBool();
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	770 }
4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	771
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	772
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	773 // Inject time-related information
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	774 std::string date, time;
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	775 Toolbox::GetNowDicom(date, time);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	776 dicom.Replace(DICOM_TAG_ACQUISITION_DATE, date);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	777 dicom.Replace(DICOM_TAG_ACQUISITION_TIME, time);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	778 dicom.Replace(DICOM_TAG_CONTENT_DATE, date);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	779 dicom.Replace(DICOM_TAG_CONTENT_TIME, time);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	780 dicom.Replace(DICOM_TAG_INSTANCE_CREATION_DATE, date);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	781 dicom.Replace(DICOM_TAG_INSTANCE_CREATION_TIME, time);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	782
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	783 if (parentType == ResourceType_Patient \|\|
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	784 parentType == ResourceType_Study \|\|
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	785 parentType == ResourceType_Instance /* no parent */)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	786 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	787 dicom.Replace(DICOM_TAG_SERIES_DATE, date);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	788 dicom.Replace(DICOM_TAG_SERIES_TIME, time);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	789 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	790
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	791 if (parentType == ResourceType_Patient \|\|
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	792 parentType == ResourceType_Instance /* no parent */)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	793 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	794 dicom.Replace(DICOM_TAG_STUDY_DATE, date);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	795 dicom.Replace(DICOM_TAG_STUDY_TIME, time);
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	796 }
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
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	799 InjectTags(dicom, request["Tags"], interpretBinaryTags);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	800
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	801
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	802 // Inject the content (either an image, or a PDF file)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	803 if (request.isMember("Content"))
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	804 {
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	805 const Json::Value& content = request["Content"];
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	806
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	807 if (content.type() == Json::stringValue)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	808 {
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	809 dicom.EmbedContent(request["Content"].asString());
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	810
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	811 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	812 else if (content.type() == Json::arrayValue)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	813 {
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	814 if (content.size() > 0)
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	815 {
1565 4b23310eb7e8 add tags per instances in a series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1564 diff changeset	816 // Let's create a series instead of a single instance
1641 4e56b5a206b7 Support of binary tags encoded using data URI scheme Sebastien Jodogne <s.jodogne@gmail.com> parents: 1640 diff changeset	817 CreateSeries(call, dicom, content, interpretBinaryTags);
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	818 return;
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	819 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	820 }
1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	821 else
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	822 {
1582 bd1889029cbb encoding of exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	823 throw OrthancException(ErrorCode_CreateDicomUseDataUriScheme);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	824 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	825 }
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	826
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	827 std::string id;
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	828 StoreCreatedInstance(id, call, dicom);
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	829 OrthancRestApi::GetApi(call).AnswerStoredResource(call, id, ResourceType_Instance, StoreStatus_Success);
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	830
1564 1b7def486e62 creation of DICOM series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1562 diff changeset	831 return;
1555 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
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	834
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	835 static void CreateDicom(RestApiPostCall& call)
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	836 {
d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	837 Json::Value request;
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	838 if (!call.ParseJsonRequest(request) \|\|
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	839 !request.isObject())
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	840 {
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	841 throw OrthancException(ErrorCode_BadRequest);
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	842 }
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	843
27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	844 if (request.isMember("Tags"))
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	845 {
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	846 CreateDicomV2(call, request);
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	847 }
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	848 else
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	849 {
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	850 // Compatibility with Orthanc <= 0.9.3
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	851 ParsedDicomFile dicom;
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	852 CreateDicomV1(dicom, call, request);
1569 27774f6f84e4 improved error handling in http answers jodogne parents: 1566 diff changeset	853
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	854 std::string id;
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1570 diff changeset	855 StoreCreatedInstance(id, call, dicom);
1570 2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	856 OrthancRestApi::GetApi(call).AnswerStoredResource(call, id, ResourceType_Instance, StoreStatus_Success);
2bd2c280f9b5 fix indentation jodogne parents: 1569 diff changeset	857 }
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	858 }
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	859
e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	860
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	861 void OrthancRestApi::RegisterAnonymizeModify()
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	862 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863 Register("/instances/{id}/modify", ModifyInstance);
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	864 Register("/series/{id}/modify", ModifyResource<ChangeType_ModifiedSeries, ResourceType_Series>);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	865 Register("/studies/{id}/modify", ModifyResource<ChangeType_ModifiedStudy, ResourceType_Study>);
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	866 Register("/patients/{id}/modify", ModifyResource<ChangeType_ModifiedPatient, ResourceType_Patient>);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	868 Register("/instances/{id}/anonymize", AnonymizeInstance);
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	869 Register("/series/{id}/anonymize", AnonymizeResource<ChangeType_ModifiedSeries, ResourceType_Series>);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	870 Register("/studies/{id}/anonymize", AnonymizeResource<ChangeType_ModifiedStudy, ResourceType_Study>);
ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 782 diff changeset	871 Register("/patients/{id}/anonymize", AnonymizeResource<ChangeType_ModifiedPatient, ResourceType_Patient>);
796 e7b1ca0f1e04 creation of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	872
1120 009dce4ea2f6 /tools/create-dicom now accepts PatientID Sebastien Jodogne <s.jodogne@gmail.com> parents: 1010 diff changeset	873 Register("/tools/create-dicom", CreateDicom);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	874 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	875 }

Mercurial > hg > orthanc

annotate OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 1645:1558b3226b18