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

annotate OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp @ 4294:0923247e69f6

log categories: rest -> http + added lua & jobs

author	Alain Mazy <alain@mazy.be>
date	Thu, 05 Nov 2020 11:43:32 +0100
parents	1661544ea94d
children	1263e727d048

rev	line source
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1819 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1165 diff changeset	4 * Department, University Hospital of Liege, Belgium
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3592 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * 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	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * 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	18 * 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	19 * 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	20 * 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	21 * version. If you delete this exception statement from all source files
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * 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	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * 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	30 * 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	31 **/
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	34 #include "../PrecompiledHeadersServer.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "OrthancRestApi.h"
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	37 #include "../../../OrthancFramework/Sources/Cache/SharedArchive.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	38 #include "../../../OrthancFramework/Sources/DicomNetworking/DicomAssociation.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	39 #include "../../../OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	40 #include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	41 #include "../../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	42 #include "../../../OrthancFramework/Sources/SerializationToolbox.h"
3095 beeeb6096f27 removing dependencies upon ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	43
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	44 #include "../OrthancConfiguration.h"
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	45 #include "../QueryRetrieveHandler.h"
3097 ac72032d69a2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3096 diff changeset	46 #include "../ServerContext.h"
2602 c25f1a52acbc reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2589 diff changeset	47 #include "../ServerJobs/DicomModalityStoreJob.h"
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	48 #include "../ServerJobs/DicomMoveScuJob.h"
2602 c25f1a52acbc reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2589 diff changeset	49 #include "../ServerJobs/OrthancPeerStoreJob.h"
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	50 #include "../ServerToolbox.h"
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	51 #include "../StorageCommitmentReports.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	53
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 namespace Orthanc
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 {
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	56 static const char* const KEY_LEVEL = "Level";
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	57 static const char* const KEY_LOCAL_AET = "LocalAet";
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	58 static const char* const KEY_NORMALIZE = "Normalize";
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	59 static const char* const KEY_QUERY = "Query";
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	60 static const char* const KEY_RESOURCES = "Resources";
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	61 static const char* const KEY_TARGET_AET = "TargetAet";
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	62 static const char* const KEY_TIMEOUT = "Timeout";
3808 7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	63 static const char* const SOP_CLASS_UID = "SOPClassUID";
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	64 static const char* const SOP_INSTANCE_UID = "SOPInstanceUID";
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	65
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	66 static RemoteModalityParameters MyGetModalityUsingSymbolicName(const std::string& name)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	67 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	68 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	69 return lock.GetConfiguration().GetModalityUsingSymbolicName(name);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	70 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	71
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	72
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	73 static void InjectAssociationTimeout(DicomAssociationParameters& params,
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	74 const Json::Value& body)
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	75 {
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	76 if (body.type() != Json::objectValue)
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	77 {
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	78 throw OrthancException(ErrorCode_BadFileFormat, "Must provide a JSON object");
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	79 }
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	80 else if (body.isMember(KEY_TIMEOUT))
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	81 {
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	82 // New in Orthanc 1.7.0
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	83 params.SetTimeout(SerializationToolbox::ReadUnsignedInteger(body, KEY_TIMEOUT));
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	84 }
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	85 }
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	86
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	87 static DicomAssociationParameters GetAssociationParameters(RestApiPostCall& call,
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	88 const Json::Value& body)
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	89 {
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	90 const std::string& localAet =
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	91 OrthancRestApi::GetContext(call).GetDefaultLocalApplicationEntityTitle();
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	92 const RemoteModalityParameters remote =
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	93 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	94
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	95 DicomAssociationParameters params(localAet, remote);
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	96 InjectAssociationTimeout(params, body);
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	97
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	98 return params;
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	99 }
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	100
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	101
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	102 static DicomAssociationParameters GetAssociationParameters(RestApiPostCall& call)
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	103 {
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	104 Json::Value body;
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	105 call.ParseJsonRequest(body);
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	106 return GetAssociationParameters(call, body);
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	107 }
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	108
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	109
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	110 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	111 * DICOM C-Echo SCU
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	112 ***************************************************************************/
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	113
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	114 static void DicomEcho(RestApiPostCall& call)
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	115 {
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3876 diff changeset	116 DicomControlUserConnection connection(GetAssociationParameters(call));
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	117
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3876 diff changeset	118 if (connection.Echo())
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3876 diff changeset	119 {
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3876 diff changeset	120 // Echo has succeeded
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3876 diff changeset	121 call.GetOutput().AnswerBuffer("{}", MimeType_Json);
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3876 diff changeset	122 return;
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	123 }
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3876 diff changeset	124 else
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	125 {
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3876 diff changeset	126 // Echo has failed
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3876 diff changeset	127 call.GetOutput().SignalError(HttpStatus_500_InternalServerError);
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	128 }
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	129 }
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	130
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	131
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	132
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	133 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	134 * DICOM C-Find SCU => DEPRECATED!
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	135 ***************************************************************************/
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	136
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	137 static bool MergeQueryAndTemplate(DicomMap& result,
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	138 const RestApiCall& call)
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	139 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	140 Json::Value query;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	141
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	142 if (!call.ParseJsonRequest(query) \|\|
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	143 query.type() != Json::objectValue)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	144 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	145 return false;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	146 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	147
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	148 Json::Value::Members members = query.getMemberNames();
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	149 for (size_t i = 0; i < members.size(); i++)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	150 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	151 DicomTag t = FromDcmtkBridge::ParseTag(members[i]);
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	152 result.SetValue(t, query[members[i]].asString(), false);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	153 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	154
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	155 return true;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	156 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	157
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	158
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	159 static void FindPatient(DicomFindAnswers& result,
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	160 DicomControlUserConnection& connection,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	161 const DicomMap& fields)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	162 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	163 // Only keep the filters from "fields" that are related to the patient
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	164 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	165 fields.ExtractPatientInformation(s);
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	166 connection.Find(result, ResourceType_Patient, s, true /* normalize */);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	167 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	168
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	169
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	170 static void FindStudy(DicomFindAnswers& result,
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	171 DicomControlUserConnection& connection,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	172 const DicomMap& fields)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	173 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	174 // Only keep the filters from "fields" that are related to the study
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	175 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	176 fields.ExtractStudyInformation(s);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	177
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	178 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	179 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	180 s.CopyTagIfExists(fields, DICOM_TAG_MODALITIES_IN_STUDY);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	181
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	182 connection.Find(result, ResourceType_Study, s, true /* normalize */);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	183 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	184
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	185 static void FindSeries(DicomFindAnswers& result,
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	186 DicomControlUserConnection& connection,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	187 const DicomMap& fields)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	188 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	189 // Only keep the filters from "fields" that are related to the series
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	190 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	191 fields.ExtractSeriesInformation(s);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	192
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	193 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	194 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	195 s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	196
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	197 connection.Find(result, ResourceType_Series, s, true /* normalize */);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	198 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	199
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	200 static void FindInstance(DicomFindAnswers& result,
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	201 DicomControlUserConnection& connection,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	202 const DicomMap& fields)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	203 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	204 // Only keep the filters from "fields" that are related to the instance
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	205 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	206 fields.ExtractInstanceInformation(s);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	207
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	208 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	209 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	210 s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	211 s.CopyTagIfExists(fields, DICOM_TAG_SERIES_INSTANCE_UID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	212
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	213 connection.Find(result, ResourceType_Instance, s, true /* normalize */);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	214 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	215
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	216
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	217 static void DicomFindPatient(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	219 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	220
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	221 DicomMap fields;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	222 DicomMap::SetupFindPatientTemplate(fields);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	223 if (!MergeQueryAndTemplate(fields, call))
751 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 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	228 DicomFindAnswers answers(false);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	230 {
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	231 DicomControlUserConnection connection(GetAssociationParameters(call));
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	232 FindPatient(answers, connection, fields);
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	233 }
751 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 Json::Value result;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	236 answers.ToJson(result, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	240 static void DicomFindStudy(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	242 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	243
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	244 DicomMap fields;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	245 DicomMap::SetupFindStudyTemplate(fields);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	246 if (!MergeQueryAndTemplate(fields, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	251 if (fields.GetValue(DICOM_TAG_ACCESSION_NUMBER).GetContent().size() <= 2 &&
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	252 fields.GetValue(DICOM_TAG_PATIENT_ID).GetContent().size() <= 2)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	257 DicomFindAnswers answers(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	258
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	259 {
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	260 DicomControlUserConnection connection(GetAssociationParameters(call));
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	261 FindStudy(answers, connection, fields);
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	262 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264 Json::Value result;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	265 answers.ToJson(result, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	269 static void DicomFindSeries(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	271 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	272
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	273 DicomMap fields;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	274 DicomMap::SetupFindSeriesTemplate(fields);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	275 if (!MergeQueryAndTemplate(fields, call))
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 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	280 if ((fields.GetValue(DICOM_TAG_ACCESSION_NUMBER).GetContent().size() <= 2 &&
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	281 fields.GetValue(DICOM_TAG_PATIENT_ID).GetContent().size() <= 2) \|\|
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	282 fields.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent().size() <= 2)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	287 DicomFindAnswers answers(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	288
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	289 {
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	290 DicomControlUserConnection connection(GetAssociationParameters(call));
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	291 FindSeries(answers, connection, fields);
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	292 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294 Json::Value result;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	295 answers.ToJson(result, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	297 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	299 static void DicomFindInstance(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	301 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	302
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	303 DicomMap fields;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	304 DicomMap::SetupFindInstanceTemplate(fields);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	305 if (!MergeQueryAndTemplate(fields, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	310 if ((fields.GetValue(DICOM_TAG_ACCESSION_NUMBER).GetContent().size() <= 2 &&
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	311 fields.GetValue(DICOM_TAG_PATIENT_ID).GetContent().size() <= 2) \|\|
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	312 fields.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent().size() <= 2 \|\|
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	313 fields.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).GetContent().size() <= 2)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	318 DicomFindAnswers answers(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	319
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	320 {
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	321 DicomControlUserConnection connection(GetAssociationParameters(call));
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	322 FindInstance(answers, connection, fields);
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	323 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 Json::Value result;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	326 answers.ToJson(result, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	330
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	331 static void CopyTagIfExists(DicomMap& target,
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4153 diff changeset	332 const ParsedDicomFile& source,
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	333 const DicomTag& tag)
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	334 {
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	335 std::string tmp;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	336 if (source.GetTagValue(tmp, tag))
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	337 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	338 target.SetValue(tag, tmp, false);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	339 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	340 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	341
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	342
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	343 static void DicomFind(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	345 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	346
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 DicomMap m;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348 DicomMap::SetupFindPatientTemplate(m);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	349 if (!MergeQueryAndTemplate(m, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 return;
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
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	354 DicomControlUserConnection connection(GetAssociationParameters(call));
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	355
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	356 DicomFindAnswers patients(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	357 FindPatient(patients, connection, m);
751 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 // Loop over the found patients
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 Json::Value result = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 for (size_t i = 0; i < patients.GetSize(); i++)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	363 Json::Value patient;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	364 patients.ToJson(patient, i, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366 DicomMap::SetupFindStudyTemplate(m);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	367 if (!MergeQueryAndTemplate(m, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370 }
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	371
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	372 CopyTagIfExists(m, patients.GetAnswer(i), DICOM_TAG_PATIENT_ID);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	374 DicomFindAnswers studies(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	375 FindStudy(studies, connection, m);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	376
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377 patient["Studies"] = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	379 // Loop over the found studies
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380 for (size_t j = 0; j < studies.GetSize(); j++)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	382 Json::Value study;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	383 studies.ToJson(study, j, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 DicomMap::SetupFindSeriesTemplate(m);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	386 if (!MergeQueryAndTemplate(m, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389 }
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	390
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	391 CopyTagIfExists(m, studies.GetAnswer(j), DICOM_TAG_PATIENT_ID);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	392 CopyTagIfExists(m, studies.GetAnswer(j), DICOM_TAG_STUDY_INSTANCE_UID);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	394 DicomFindAnswers series(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	395 FindSeries(series, connection, m);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 // Loop over the found series
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 study["Series"] = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 for (size_t k = 0; k < series.GetSize(); k++)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	401 Json::Value series2;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	402 series.ToJson(series2, k, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 study["Series"].append(series2);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406 patient["Studies"].append(study);
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
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 result.append(patient);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	416
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	417 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	418 * DICOM C-Find and C-Move SCU => Recommended since Orthanc 0.9.0
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	419 ***************************************************************************/
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	420
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	421 static void AnswerQueryHandler(RestApiPostCall& call,
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	422 std::unique_ptr<QueryRetrieveHandler>& handler)
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	423 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	424 ServerContext& context = OrthancRestApi::GetContext(call);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	425
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	426 if (handler.get() == NULL)
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	427 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	428 throw OrthancException(ErrorCode_NullPointer);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	429 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	430
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	431 handler->Run();
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	432
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	433 std::string s = context.GetQueryRetrieveArchive().Add(handler.release());
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	434 Json::Value result = Json::objectValue;
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	435 result["ID"] = s;
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	436 result["Path"] = "/queries/" + s;
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	437
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	438 call.GetOutput().AnswerJson(result);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	439 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	440
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	441
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	442 static void DicomQuery(RestApiPostCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	443 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	444 ServerContext& context = OrthancRestApi::GetContext(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	445 Json::Value request;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	446
3345 f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	447 if (!call.ParseJsonRequest(request) \|\|
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	448 request.type() != Json::objectValue)
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	449 {
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	450 throw OrthancException(ErrorCode_BadFileFormat, "Must provide a JSON object");
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	451 }
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	452 else if (!request.isMember(KEY_LEVEL) \|\|
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	453 request[KEY_LEVEL].type() != Json::stringValue)
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	454 {
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	455 throw OrthancException(ErrorCode_BadFileFormat,
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	456 "The JSON body must contain field " + std::string(KEY_LEVEL));
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	457 }
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	458 else if (request.isMember(KEY_NORMALIZE) &&
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	459 request[KEY_NORMALIZE].type() != Json::booleanValue)
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	460 {
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	461 throw OrthancException(ErrorCode_BadFileFormat,
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	462 "The field " + std::string(KEY_NORMALIZE) + " must contain a Boolean");
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	463 }
3345 f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	464 else if (request.isMember(KEY_QUERY) &&
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	465 request[KEY_QUERY].type() != Json::objectValue)
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	466 {
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	467 throw OrthancException(ErrorCode_BadFileFormat,
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	468 "The field " + std::string(KEY_QUERY) + " must contain a JSON object");
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	469 }
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	470 else
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	471 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	472 std::unique_ptr<QueryRetrieveHandler> handler(new QueryRetrieveHandler(context));
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	473
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	474 handler->SetModality(call.GetUriComponent("id", ""));
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	475 handler->SetLevel(StringToResourceType(request[KEY_LEVEL].asCString()));
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	476
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	477 if (request.isMember(KEY_QUERY))
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	478 {
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	479 std::map<DicomTag, std::string> query;
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	480 SerializationToolbox::ReadMapOfTags(query, request, KEY_QUERY);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	481
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	482 for (std::map<DicomTag, std::string>::const_iterator
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	483 it = query.begin(); it != query.end(); ++it)
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	484 {
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	485 handler->SetQuery(it->first, it->second);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	486 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	487 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	488
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	489 if (request.isMember(KEY_NORMALIZE))
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	490 {
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	491 handler->SetFindNormalized(request[KEY_NORMALIZE].asBool());
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	492 }
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	493
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	494 AnswerQueryHandler(call, handler);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	495 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	496 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	497
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	498
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	499 static void ListQueries(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	500 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	501 ServerContext& context = OrthancRestApi::GetContext(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	502
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	503 std::list<std::string> queries;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	504 context.GetQueryRetrieveArchive().List(queries);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	505
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	506 Json::Value result = Json::arrayValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	507 for (std::list<std::string>::const_iterator
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	508 it = queries.begin(); it != queries.end(); ++it)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	509 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	510 result.append(*it);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	511 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	512
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	513 call.GetOutput().AnswerJson(result);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	514 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	515
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	516
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	517 namespace
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	518 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	519 class QueryAccessor
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	520 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	521 private:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	522 ServerContext& context_;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	523 SharedArchive::Accessor accessor_;
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	524 QueryRetrieveHandler* handler_;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	525
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	526 public:
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4153 diff changeset	527 explicit QueryAccessor(RestApiCall& call) :
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	528 context_(OrthancRestApi::GetContext(call)),
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	529 accessor_(context_.GetQueryRetrieveArchive(), call.GetUriComponent("id", "")),
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	530 handler_(NULL)
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	531 {
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	532 if (accessor_.IsValid())
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	533 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	534 handler_ = &dynamic_cast<QueryRetrieveHandler&>(accessor_.GetItem());
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	535 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	536 else
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	537 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	538 throw OrthancException(ErrorCode_UnknownResource);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	539 }
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	540 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	541
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	542 QueryRetrieveHandler& GetHandler() const
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	543 {
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	544 assert(handler_ != NULL);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	545 return *handler_;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	546 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	547 };
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	548
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	549 static void AnswerDicomMap(RestApiCall& call,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	550 const DicomMap& value,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	551 bool simplify)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	552 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	553 Json::Value full = Json::objectValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	554 FromDcmtkBridge::ToJson(full, value, simplify);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	555 call.GetOutput().AnswerJson(full);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	556 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	557 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	558
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	559
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	560 static void ListQueryAnswers(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	561 {
2948 d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	562 const bool expand = call.HasArgument("expand");
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	563 const bool simplify = call.HasArgument("simplify");
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	564
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	565 QueryAccessor query(call);
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	566 size_t count = query.GetHandler().GetAnswersCount();
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	567
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	568 Json::Value result = Json::arrayValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	569 for (size_t i = 0; i < count; i++)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	570 {
2948 d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	571 if (expand)
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	572 {
2988 9cc3d40e389b Orthanc 1.4.3 is now known as 1.5.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2986 diff changeset	573 // New in Orthanc 1.5.0
2948 d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	574 DicomMap value;
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	575 query.GetHandler().GetAnswer(value, i);
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	576
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	577 Json::Value json = Json::objectValue;
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	578 FromDcmtkBridge::ToJson(json, value, simplify);
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	579
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	580 result.append(json);
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	581 }
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	582 else
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	583 {
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	584 result.append(boost::lexical_cast<std::string>(i));
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	585 }
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	586 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	587
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	588 call.GetOutput().AnswerJson(result);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	589 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	590
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	591
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	592 static void GetQueryOneAnswer(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	593 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	594 size_t index = boost::lexical_cast<size_t>(call.GetUriComponent("index", ""));
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	595
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	596 QueryAccessor query(call);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	597
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	598 DicomMap map;
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	599 query.GetHandler().GetAnswer(map, index);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	600
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	601 AnswerDicomMap(call, map, call.HasArgument("simplify"));
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	602 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	603
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	604
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	605 static void SubmitRetrieveJob(RestApiPostCall& call,
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	606 bool allAnswers,
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	607 size_t index)
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	608 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	609 ServerContext& context = OrthancRestApi::GetContext(call);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	610
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	611 std::string targetAet;
3870 09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	612 int timeout = -1;
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	613
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	614 Json::Value body;
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	615 if (call.ParseJsonRequest(body))
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	616 {
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	617 targetAet = Toolbox::GetJsonStringField(body, KEY_TARGET_AET, context.GetDefaultLocalApplicationEntityTitle());
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	618 timeout = Toolbox::GetJsonIntegerField(body, KEY_TIMEOUT, -1);
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	619 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	620 else
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	621 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	622 body = Json::objectValue;
3870 09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	623 if (call.GetBodySize() > 0)
09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	624 {
09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	625 call.BodyToString(targetAet);
09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	626 }
09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	627 else
09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	628 {
09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	629 targetAet = context.GetDefaultLocalApplicationEntityTitle();
09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	630 }
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	631 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	632
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	633 std::unique_ptr<DicomMoveScuJob> job(new DicomMoveScuJob(context));
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	634
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	635 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	636 QueryAccessor query(call);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	637 job->SetTargetAet(targetAet);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	638 job->SetLocalAet(query.GetHandler().GetLocalAet());
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	639 job->SetRemoteModality(query.GetHandler().GetRemoteModality());
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	640
ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	641 if (timeout >= 0)
ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	642 {
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	643 // New in Orthanc 1.7.0
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	644 job->SetTimeout(static_cast<uint32_t>(timeout));
ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	645 }
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	646
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	647 LOG(WARNING) << "Driving C-Move SCU on remote modality "
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	648 << query.GetHandler().GetRemoteModality().GetApplicationEntityTitle()
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	649 << " to target modality " << targetAet;
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	650
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	651 if (allAnswers)
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	652 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	653 for (size_t i = 0; i < query.GetHandler().GetAnswersCount(); i++)
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	654 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	655 job->AddFindAnswer(query.GetHandler(), i);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	656 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	657 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	658 else
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	659 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	660 job->AddFindAnswer(query.GetHandler(), index);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	661 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	662 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	663
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	664 OrthancRestApi::GetApi(call).SubmitCommandsJob
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	665 (call, job.release(), true /* synchronous by default */, body);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	666 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	667
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	668
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	669 static void RetrieveOneAnswer(RestApiPostCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	670 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	671 size_t index = boost::lexical_cast<size_t>(call.GetUriComponent("index", ""));
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	672 SubmitRetrieveJob(call, false, index);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	673 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	674
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	675
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	676 static void RetrieveAllAnswers(RestApiPostCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	677 {
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	678 SubmitRetrieveJob(call, true, 0);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	679 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	680
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	681
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	682 static void GetQueryArguments(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	683 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	684 QueryAccessor query(call);
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	685 AnswerDicomMap(call, query.GetHandler().GetQuery(), call.HasArgument("simplify"));
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	686 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	687
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	688
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	689 static void GetQueryLevel(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	690 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	691 QueryAccessor query(call);
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	692 call.GetOutput().AnswerBuffer(EnumerationToString(query.GetHandler().GetLevel()), MimeType_PlainText);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	693 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	694
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	695
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	696 static void GetQueryModality(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	697 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	698 QueryAccessor query(call);
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	699 call.GetOutput().AnswerBuffer(query.GetHandler().GetModalitySymbolicName(), MimeType_PlainText);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	700 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	701
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	702
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	703 static void DeleteQuery(RestApiDeleteCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	704 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	705 ServerContext& context = OrthancRestApi::GetContext(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	706 context.GetQueryRetrieveArchive().Remove(call.GetUriComponent("id", ""));
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	707 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	708 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	709
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	710
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	711 static void ListQueryOperations(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	712 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	713 // Ensure that the query of interest does exist
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	714 QueryAccessor query(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	715
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	716 RestApi::AutoListChildren(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	717 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	718
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	719
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	720 static void ListQueryAnswerOperations(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	721 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	722 // Ensure that the query of interest does exist
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	723 QueryAccessor query(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	724
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	725 // Ensure that the answer of interest does exist
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	726 size_t index = boost::lexical_cast<size_t>(call.GetUriComponent("index", ""));
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	727
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	728 DicomMap map;
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	729 query.GetHandler().GetAnswer(map, index);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	730
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	731 Json::Value answer = Json::arrayValue;
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	732 answer.append("content");
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	733 answer.append("retrieve");
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	734
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	735 switch (query.GetHandler().GetLevel())
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	736 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	737 case ResourceType_Patient:
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	738 answer.append("query-study");
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	739
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	740 case ResourceType_Study:
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	741 answer.append("query-series");
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	742
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	743 case ResourceType_Series:
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	744 answer.append("query-instances");
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	745 break;
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	746
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	747 default:
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	748 break;
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	749 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	750
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	751 call.GetOutput().AnswerJson(answer);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	752 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	753
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	754
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	755 template <ResourceType CHILDREN_LEVEL>
2986 b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	756 static void QueryAnswerChildren(RestApiPostCall& call)
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	757 {
2988 9cc3d40e389b Orthanc 1.4.3 is now known as 1.5.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2986 diff changeset	758 // New in Orthanc 1.5.0
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	759 assert(CHILDREN_LEVEL == ResourceType_Study \|\|
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	760 CHILDREN_LEVEL == ResourceType_Series \|\|
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	761 CHILDREN_LEVEL == ResourceType_Instance);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	762
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	763 ServerContext& context = OrthancRestApi::GetContext(call);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	764
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	765 std::unique_ptr<QueryRetrieveHandler> handler(new QueryRetrieveHandler(context));
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	766
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	767 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	768 const QueryAccessor parent(call);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	769 const ResourceType level = parent.GetHandler().GetLevel();
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	770
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	771 const size_t index = boost::lexical_cast<size_t>(call.GetUriComponent("index", ""));
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	772
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	773 Json::Value request;
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	774
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	775 if (index >= parent.GetHandler().GetAnswersCount())
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	776 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	777 throw OrthancException(ErrorCode_ParameterOutOfRange);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	778 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	779 else if (CHILDREN_LEVEL == ResourceType_Study &&
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	780 level != ResourceType_Patient)
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	781 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	782 throw OrthancException(ErrorCode_UnknownResource);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	783 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	784 else if (CHILDREN_LEVEL == ResourceType_Series &&
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	785 level != ResourceType_Patient &&
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	786 level != ResourceType_Study)
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	787 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	788 throw OrthancException(ErrorCode_UnknownResource);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	789 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	790 else if (CHILDREN_LEVEL == ResourceType_Instance &&
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	791 level != ResourceType_Patient &&
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	792 level != ResourceType_Study &&
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	793 level != ResourceType_Series)
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	794 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	795 throw OrthancException(ErrorCode_UnknownResource);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	796 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	797 else if (!call.ParseJsonRequest(request))
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	798 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	799 throw OrthancException(ErrorCode_BadFileFormat, "Must provide a JSON object");
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	800 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	801 else
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	802 {
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	803 handler->SetFindNormalized(parent.GetHandler().IsFindNormalized());
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	804 handler->SetModality(parent.GetHandler().GetModalitySymbolicName());
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	805 handler->SetLevel(CHILDREN_LEVEL);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	806
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	807 if (request.isMember(KEY_QUERY))
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	808 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	809 std::map<DicomTag, std::string> query;
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	810 SerializationToolbox::ReadMapOfTags(query, request, KEY_QUERY);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	811
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	812 for (std::map<DicomTag, std::string>::const_iterator
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	813 it = query.begin(); it != query.end(); ++it)
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	814 {
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	815 handler->SetQuery(it->first, it->second);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	816 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	817 }
2986 b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	818
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	819 DicomMap answer;
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	820 parent.GetHandler().GetAnswer(answer, index);
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	821
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	822 // This switch-case mimics "DicomControlUserConnection::Move()"
2986 b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	823 switch (parent.GetHandler().GetLevel())
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	824 {
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	825 case ResourceType_Patient:
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	826 handler->CopyStringTag(answer, DICOM_TAG_PATIENT_ID);
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	827 break;
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	828
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	829 case ResourceType_Study:
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	830 handler->CopyStringTag(answer, DICOM_TAG_STUDY_INSTANCE_UID);
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	831 break;
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	832
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	833 case ResourceType_Series:
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	834 handler->CopyStringTag(answer, DICOM_TAG_STUDY_INSTANCE_UID);
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	835 handler->CopyStringTag(answer, DICOM_TAG_SERIES_INSTANCE_UID);
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	836 break;
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	837
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	838 case ResourceType_Instance:
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	839 handler->CopyStringTag(answer, DICOM_TAG_STUDY_INSTANCE_UID);
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	840 handler->CopyStringTag(answer, DICOM_TAG_SERIES_INSTANCE_UID);
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	841 handler->CopyStringTag(answer, DICOM_TAG_SOP_INSTANCE_UID);
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	842 break;
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	843
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	844 default:
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	845 throw OrthancException(ErrorCode_InternalError);
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	846 }
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	847 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	848 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	849
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	850 AnswerQueryHandler(call, handler);
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	851 }
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	852
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	853
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	854
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	855 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	856 * DICOM C-Store SCU
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	857 ***************************************************************************/
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	858
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	859 static void GetInstancesToExport(Json::Value& otherArguments,
2626 e09021ddc00d cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 2624 diff changeset	860 SetOfInstancesJob& job,
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	861 const std::string& remote,
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	862 RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	864 otherArguments = Json::objectValue;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	865 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	866
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	867 Json::Value request;
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	868 if (Toolbox::IsSHA1(call.GetBodyData(), call.GetBodySize()))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	869 {
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	870 std::string s;
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	871 call.BodyToString(s);
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	872
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	873 // This is for compatibility with Orthanc <= 0.5.1.
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	874 request = Json::arrayValue;
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	875 request.append(Toolbox::StripSpaces(s));
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	877 else if (!call.ParseJsonRequest(request))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	878 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	879 // Bad JSON request
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	880 throw OrthancException(ErrorCode_BadFileFormat, "Must provide a JSON value");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	881 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	882
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	883 if (request.isString())
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	884 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	885 std::string item = request.asString();
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	886 request = Json::arrayValue;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	887 request.append(item);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	888 }
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	889 else if (!request.isArray() &&
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	890 !request.isObject())
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	891 {
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	892 throw OrthancException(ErrorCode_BadFileFormat, "Must provide a JSON object, or a JSON array of strings");
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	893 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	894
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	895 const Json::Value* resources;
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	896 if (request.isArray())
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	897 {
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	898 resources = &request;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	899 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	900 else
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	901 {
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	902 if (request.type() != Json::objectValue \|\|
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	903 !request.isMember(KEY_RESOURCES))
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	904 {
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	905 throw OrthancException(ErrorCode_BadFileFormat,
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	906 "Missing field in JSON: \"" + std::string(KEY_RESOURCES) + "\"");
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	907 }
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	908
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	909 resources = &request[KEY_RESOURCES];
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	910 if (!resources->isArray())
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	911 {
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	912 throw OrthancException(ErrorCode_BadFileFormat,
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	913 "JSON field \"" + std::string(KEY_RESOURCES) + "\" must contain an array");
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	914 }
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	915
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	916 // Copy the remaining arguments
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	917 Json::Value::Members members = request.getMemberNames();
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	918 for (Json::Value::ArrayIndex i = 0; i < members.size(); i++)
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	919 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	920 otherArguments[members[i]] = request[members[i]];
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	921 }
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	922 }
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	923
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	924 bool logExportedResources;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	925
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	926 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	927 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	928 logExportedResources = lock.GetConfiguration().GetBooleanParameter("LogExportedResources", false);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	929 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	930
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	931 for (Json::Value::ArrayIndex i = 0; i < resources->size(); i++)
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	932 {
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	933 if (!(*resources) [i].isString())
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	934 {
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	935 throw OrthancException(ErrorCode_BadFileFormat,
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	936 "Resources to be exported must be specified as a JSON array of strings");
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	937 }
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	938
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	939 std::string stripped = Toolbox::StripSpaces((*resources) [i].asString());
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	940 if (!Toolbox::IsSHA1(stripped))
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	941 {
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	942 throw OrthancException(ErrorCode_BadFileFormat,
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	943 "This string is not a valid Orthanc identifier: " + stripped);
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	944 }
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	945
3374 d0d6bd633e4c Reporting of "ParentResources" in "DicomModalityStore" and "DicomModalityStore" jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3370 diff changeset	946 job.AddParentResource(stripped); // New in Orthanc 1.5.7
d0d6bd633e4c Reporting of "ParentResources" in "DicomModalityStore" and "DicomModalityStore" jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3370 diff changeset	947
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	948 context.AddChildInstances(job, stripped);
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	949
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	950 if (logExportedResources)
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	951 {
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	952 context.GetIndex().LogExportedResource(stripped, remote);
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	953 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	954 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	955 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	956
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	957
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	958 static void DicomStore(RestApiPostCall& call)
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	959 {
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	960 ServerContext& context = OrthancRestApi::GetContext(call);
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	961
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	962 std::string remote = call.GetUriComponent("id", "");
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	963
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	964 Json::Value request;
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	965 std::unique_ptr<DicomModalityStoreJob> job(new DicomModalityStoreJob(context));
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	966
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	967 GetInstancesToExport(request, *job, remote, call);
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	968
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	969 std::string localAet = Toolbox::GetJsonStringField
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	970 (request, KEY_LOCAL_AET, context.GetDefaultLocalApplicationEntityTitle());
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	971 std::string moveOriginatorAET = Toolbox::GetJsonStringField
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	972 (request, "MoveOriginatorAet", context.GetDefaultLocalApplicationEntityTitle());
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	973 int moveOriginatorID = Toolbox::GetJsonIntegerField
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	974 (request, "MoveOriginatorID", 0 /* By default, not a C-MOVE */);
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	975
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	976 job->SetLocalAet(localAet);
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	977 job->SetRemoteModality(MyGetModalityUsingSymbolicName(remote));
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	978
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	979 if (moveOriginatorID != 0)
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	980 {
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	981 job->SetMoveOriginator(moveOriginatorAET, moveOriginatorID);
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	982 }
2626 e09021ddc00d cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 2624 diff changeset	983
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	984 // New in Orthanc 1.6.0
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	985 if (Toolbox::GetJsonBooleanField(request, "StorageCommitment", false))
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	986 {
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	987 job->EnableStorageCommitment(true);
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	988 }
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	989
3870 09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	990 // New in Orthanc 1.7.0
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	991 if (request.isMember(KEY_TIMEOUT))
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	992 {
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	993 job->SetTimeout(SerializationToolbox::ReadUnsignedInteger(request, KEY_TIMEOUT));
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	994 }
3870 09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	995
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	996 OrthancRestApi::GetApi(call).SubmitCommandsJob
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	997 (call, job.release(), true /* synchronous by default */, request);
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	998 }
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	999
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	1000
3808 7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1001 static void DicomStoreStraight(RestApiPostCall& call)
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1002 {
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	1003 Json::Value body = Json::objectValue; // No body
92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	1004 DicomStoreUserConnection connection(GetAssociationParameters(call, body));
3808 7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1005
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1006 std::string sopClassUid, sopInstanceUid;
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3876 diff changeset	1007 connection.Store(sopClassUid, sopInstanceUid, call.GetBodyData(),
8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3876 diff changeset	1008 call.GetBodySize(), false /* Not a C-MOVE */, "", 0);
3808 7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1009
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1010 Json::Value answer = Json::objectValue;
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1011 answer[SOP_CLASS_UID] = sopClassUid;
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1012 answer[SOP_INSTANCE_UID] = sopInstanceUid;
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1013
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1014 call.GetOutput().AnswerJson(answer);
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1015 }
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1016
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1017
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1018 /***************************************************************************
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1019 * DICOM C-Move SCU
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1020 ***************************************************************************/
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1021
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1022 static void DicomMove(RestApiPostCall& call)
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1023 {
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4153 diff changeset	1024 const ServerContext& context = OrthancRestApi::GetContext(call);
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1025
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1026 Json::Value request;
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1027
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1028 if (!call.ParseJsonRequest(request) \|\|
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1029 request.type() != Json::objectValue \|\|
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1030 !request.isMember(KEY_RESOURCES) \|\|
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1031 !request.isMember(KEY_LEVEL) \|\|
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1032 request[KEY_RESOURCES].type() != Json::arrayValue \|\|
94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1033 request[KEY_LEVEL].type() != Json::stringValue)
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1034 {
3345 f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	1035 throw OrthancException(ErrorCode_BadFileFormat, "Must provide a JSON body containing fields " +
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	1036 std::string(KEY_RESOURCES) + " and " + std::string(KEY_LEVEL));
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1037 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1038
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1039 ResourceType level = StringToResourceType(request[KEY_LEVEL].asCString());
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1040
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	1041 std::string localAet = Toolbox::GetJsonStringField
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	1042 (request, KEY_LOCAL_AET, context.GetDefaultLocalApplicationEntityTitle());
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	1043 std::string targetAet = Toolbox::GetJsonStringField
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	1044 (request, KEY_TARGET_AET, context.GetDefaultLocalApplicationEntityTitle());
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1045
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	1046 const RemoteModalityParameters source =
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1047 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	1048
3874 2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3870 diff changeset	1049 DicomAssociationParameters params(localAet, source);
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	1050 InjectAssociationTimeout(params, request);
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3874 diff changeset	1051
3874 2effa961f67f forcing use of DicomAssociationParameters if creating an SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 3870 diff changeset	1052 DicomControlUserConnection connection(params);
3870 09798f2b985f added a Timeout argument to every DICOM command + 'TargetAet' not mandatory anymore in /retrieve Alain Mazy <alain@mazy.be> parents: 3863 diff changeset	1053
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1054 for (Json::Value::ArrayIndex i = 0; i < request[KEY_RESOURCES].size(); i++)
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1055 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1056 DicomMap resource;
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1057 FromDcmtkBridge::FromJson(resource, request[KEY_RESOURCES][i]);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	1058
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	1059 connection.Move(targetAet, level, resource);
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1060 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1061
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1062 // Move has succeeded
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1063 call.GetOutput().AnswerBuffer("{}", MimeType_Json);
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1064 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1065
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1066
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1067
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1068 /***************************************************************************
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1069 * Orthanc Peers => Store client
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1070 ***************************************************************************/
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1071
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1072 static bool IsExistingPeer(const OrthancRestApi::SetOfStrings& peers,
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1073 const std::string& id)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1074 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1075 return peers.find(id) != peers.end();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1076 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1077
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1078 static void ListPeers(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1079 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1080 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1081
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1082 OrthancRestApi::SetOfStrings peers;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1083 lock.GetConfiguration().GetListOfOrthancPeers(peers);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1084
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1085 if (call.HasArgument("expand"))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1086 {
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1087 Json::Value result = Json::objectValue;
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1088 for (OrthancRestApi::SetOfStrings::const_iterator
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1089 it = peers.begin(); it != peers.end(); ++it)
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1090 {
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1091 WebServiceParameters peer;
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2685 diff changeset	1092
2944 f395460af74d simplifying OrthancConfiguration for modalities/peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1093 if (lock.GetConfiguration().LookupOrthancPeer(peer, *it))
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1094 {
3192 595bfee4391a URI "/peers?expand" provides more information Sebastien Jodogne <s.jodogne@gmail.com> parents: 3167 diff changeset	1095 Json::Value info;
595bfee4391a URI "/peers?expand" provides more information Sebastien Jodogne <s.jodogne@gmail.com> parents: 3167 diff changeset	1096 peer.FormatPublic(info);
595bfee4391a URI "/peers?expand" provides more information Sebastien Jodogne <s.jodogne@gmail.com> parents: 3167 diff changeset	1097 result[*it] = info;
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1098 }
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1099 }
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1100 call.GetOutput().AnswerJson(result);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1101 }
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1102 else // if expand is not present, keep backward compatibility and return an array of peers
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1103 {
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1104 Json::Value result = Json::arrayValue;
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1105 for (OrthancRestApi::SetOfStrings::const_iterator
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1106 it = peers.begin(); it != peers.end(); ++it)
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1107 {
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1108 result.append(*it);
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1109 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1110
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1111 call.GetOutput().AnswerJson(result);
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1112 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1113 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1114
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1115 static void ListPeerOperations(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1116 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1117 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1118
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1119 OrthancRestApi::SetOfStrings peers;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1120 lock.GetConfiguration().GetListOfOrthancPeers(peers);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1121
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1122 std::string id = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1123 if (IsExistingPeer(peers, id))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1124 {
1063 0332e6e8c679 Fix automated generation of the list of resource children in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1049 diff changeset	1125 RestApi::AutoListChildren(call);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1126 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1127 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1128
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1129 static void PeerStore(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1130 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1131 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1132
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1133 std::string remote = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1134
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1135 Json::Value request;
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1136 std::unique_ptr<OrthancPeerStoreJob> job(new OrthancPeerStoreJob(context));
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1137
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1138 GetInstancesToExport(request, *job, remote, call);
3950 5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1139
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1140 static const char* TRANSCODE = "Transcode";
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1141 if (request.type() == Json::objectValue &&
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1142 request.isMember(TRANSCODE))
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1143 {
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1144 job->SetTranscode(SerializationToolbox::ReadString(request, TRANSCODE));
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1145 }
4153 a4664f169cd7 "/peers/{id}/store": New option "Compress" to compress DICOM data using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	1146
a4664f169cd7 "/peers/{id}/store": New option "Compress" to compress DICOM data using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	1147 static const char* COMPRESS = "Compress";
a4664f169cd7 "/peers/{id}/store": New option "Compress" to compress DICOM data using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	1148 if (request.type() == Json::objectValue &&
a4664f169cd7 "/peers/{id}/store": New option "Compress" to compress DICOM data using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	1149 request.isMember(COMPRESS))
a4664f169cd7 "/peers/{id}/store": New option "Compress" to compress DICOM data using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	1150 {
a4664f169cd7 "/peers/{id}/store": New option "Compress" to compress DICOM data using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	1151 job->SetCompress(SerializationToolbox::ReadBoolean(request, COMPRESS));
a4664f169cd7 "/peers/{id}/store": New option "Compress" to compress DICOM data using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	1152 }
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1153
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1154 {
3950 5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1155 OrthancConfiguration::ReaderLock lock;
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1156
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1157 WebServiceParameters peer;
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1158 if (lock.GetConfiguration().LookupOrthancPeer(peer, remote))
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1159 {
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1160 job->SetPeer(peer);
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1161 }
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1162 else
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1163 {
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1164 throw OrthancException(ErrorCode_UnknownResource,
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1165 "No peer with symbolic name: " + remote);
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1166 }
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1167 }
3950 5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1168
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1169 OrthancRestApi::GetApi(call).SubmitCommandsJob
5797ca4f3b8d "/peers/{id}/store": New option "Transcode" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	1170 (call, job.release(), true /* synchronous by default */, request);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1171 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1172
3592 de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1173 static void PeerSystem(RestApiGetCall& call)
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1174 {
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1175 std::string remote = call.GetUriComponent("id", "");
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1176
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1177 OrthancConfiguration::ReaderLock lock;
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1178
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1179 WebServiceParameters peer;
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1180 if (lock.GetConfiguration().LookupOrthancPeer(peer, remote))
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1181 {
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1182 HttpClient client(peer, "system");
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1183 std::string answer;
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1184
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1185 client.SetMethod(HttpMethod_Get);
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1186
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1187 if (!client.Apply(answer))
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1188 {
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1189 LOG(ERROR) << "Unable to get the system info from remote Orthanc peer: " << peer.GetUrl();
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1190 call.GetOutput().SignalError(client.GetLastStatus());
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1191 return;
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1192 }
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1193
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1194 call.GetOutput().AnswerBuffer(answer, MimeType_Json);
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1195 }
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1196 else
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1197 {
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1198 throw OrthancException(ErrorCode_UnknownResource,
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1199 "No peer with symbolic name: " + remote);
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1200 }
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1201 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1202
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1203 // DICOM bridge -------------------------------------------------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1204
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1205 static bool IsExistingModality(const OrthancRestApi::SetOfStrings& modalities,
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1206 const std::string& id)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1207 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1208 return modalities.find(id) != modalities.end();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1209 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1210
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1211 static void ListModalities(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1212 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1213 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1214
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1215 OrthancRestApi::SetOfStrings modalities;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1216 lock.GetConfiguration().GetListOfDicomModalities(modalities);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1217
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1218 if (call.HasArgument("expand"))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1219 {
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1220 Json::Value result = Json::objectValue;
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1221 for (OrthancRestApi::SetOfStrings::const_iterator
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1222 it = modalities.begin(); it != modalities.end(); ++it)
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1223 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1224 const RemoteModalityParameters& remote = lock.GetConfiguration().GetModalityUsingSymbolicName(*it);
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1225
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1226 Json::Value info;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1227 remote.Serialize(info, true /* force advanced format */);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1228 result[*it] = info;
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1229 }
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1230 call.GetOutput().AnswerJson(result);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1231 }
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1232 else // if expand is not present, keep backward compatibility and return an array of modalities ids
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1233 {
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1234 Json::Value result = Json::arrayValue;
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1235 for (OrthancRestApi::SetOfStrings::const_iterator
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1236 it = modalities.begin(); it != modalities.end(); ++it)
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1237 {
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1238 result.append(*it);
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1239 }
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1240 call.GetOutput().AnswerJson(result);
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1241 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1242 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1243
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1244
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1245 static void ListModalityOperations(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1246 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1247 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1248
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1249 OrthancRestApi::SetOfStrings modalities;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1250 lock.GetConfiguration().GetListOfDicomModalities(modalities);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1251
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1252 std::string id = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1253 if (IsExistingModality(modalities, id))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1254 {
1063 0332e6e8c679 Fix automated generation of the list of resource children in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1049 diff changeset	1255 RestApi::AutoListChildren(call);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1256 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1257 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1258
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1259
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1260 static void UpdateModality(RestApiPutCall& call)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1261 {
2801 3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1262 ServerContext& context = OrthancRestApi::GetContext(call);
3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1263
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1264 Json::Value json;
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	1265 if (call.ParseJsonRequest(json))
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1266 {
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1267 RemoteModalityParameters modality;
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1268 modality.Unserialize(json);
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1269
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1270 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1271 OrthancConfiguration::WriterLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1272 lock.GetConfiguration().UpdateModality(call.GetUriComponent("id", ""), modality);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1273 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1274
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1275 context.SignalUpdatedModalities();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1276
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1277 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1278 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1279 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1280
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1281
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1282 static void DeleteModality(RestApiDeleteCall& call)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1283 {
2801 3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1284 ServerContext& context = OrthancRestApi::GetContext(call);
3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1285
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1286 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1287 OrthancConfiguration::WriterLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1288 lock.GetConfiguration().RemoveModality(call.GetUriComponent("id", ""));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1289 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1290
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1291 context.SignalUpdatedModalities();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1292
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1293 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1294 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1295
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1296
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1297 static void UpdatePeer(RestApiPutCall& call)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1298 {
2801 3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1299 ServerContext& context = OrthancRestApi::GetContext(call);
3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1300
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1301 Json::Value json;
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	1302 if (call.ParseJsonRequest(json))
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1303 {
2020 a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	1304 WebServiceParameters peer;
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1305 peer.Unserialize(json);
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1306
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1307 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1308 OrthancConfiguration::WriterLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1309 lock.GetConfiguration().UpdatePeer(call.GetUriComponent("id", ""), peer);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1310 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1311
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1312 context.SignalUpdatedPeers();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1313
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1314 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1315 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1316 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1317
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1318
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1319 static void DeletePeer(RestApiDeleteCall& call)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1320 {
2801 3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1321 ServerContext& context = OrthancRestApi::GetContext(call);
3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1322
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1323 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1324 OrthancConfiguration::WriterLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1325 lock.GetConfiguration().RemovePeer(call.GetUriComponent("id", ""));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1326 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1327
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1328 context.SignalUpdatedPeers();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1329
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1330 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1331 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1332
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1333
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1334 static void DicomFindWorklist(RestApiPostCall& call)
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1335 {
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1336 Json::Value json;
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1337 if (call.ParseJsonRequest(json))
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1338 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1339 std::unique_ptr<ParsedDicomFile> query
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1340 (ParsedDicomFile::CreateFromJson(json, static_cast<DicomFromJsonFlags>(0),
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3651 diff changeset	1341 "" /* no private creator */));
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1342
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1343 DicomFindAnswers answers(true);
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1344
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1345 {
3876 92ecaf877baf improved code reuse in OrthancRestModalities, added missing timeout params Sebastien Jodogne <s.jodogne@gmail.com> parents: 3875 diff changeset	1346 DicomControlUserConnection connection(GetAssociationParameters(call, json));
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	1347 connection.FindWorklist(answers, *query);
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1348 }
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1349
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1350 Json::Value result;
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1351 answers.ToJson(result, true);
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1352 call.GetOutput().AnswerJson(result);
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1353 }
3345 f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	1354 else
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	1355 {
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	1356 throw OrthancException(ErrorCode_BadFileFormat, "Must provide a JSON object");
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	1357 }
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1358 }
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1359
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1360
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1361 // Storage commitment SCU ---------------------------------------------------
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1362
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1363 static void StorageCommitmentScu(RestApiPostCall& call)
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1364 {
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1365 static const char* const ORTHANC_RESOURCES = "Resources";
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1366 static const char* const DICOM_INSTANCES = "DicomInstances";
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1367
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1368 ServerContext& context = OrthancRestApi::GetContext(call);
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1369
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1370 Json::Value json;
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1371 if (!call.ParseJsonRequest(json) \|\|
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1372 json.type() != Json::objectValue)
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1373 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1374 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1375 "Must provide a JSON object with a list of resources");
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1376 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1377 else if (!json.isMember(ORTHANC_RESOURCES) &&
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1378 !json.isMember(DICOM_INSTANCES))
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1379 {
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1380 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1381 "Empty storage commitment request, one of these fields is mandatory: \"" +
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1382 std::string(ORTHANC_RESOURCES) + "\" or \"" + std::string(DICOM_INSTANCES) + "\"");
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1383 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1384 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1385 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1386 std::list<std::string> sopClassUids, sopInstanceUids;
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1387
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1388 if (json.isMember(ORTHANC_RESOURCES))
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1389 {
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1390 const Json::Value& resources = json[ORTHANC_RESOURCES];
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1391
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1392 if (resources.type() != Json::arrayValue)
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1393 {
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1394 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1395 "The \"" + std::string(ORTHANC_RESOURCES) +
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1396 "\" field must provide an array of Orthanc resources");
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1397 }
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1398 else
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1399 {
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1400 for (Json::Value::ArrayIndex i = 0; i < resources.size(); i++)
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1401 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1402 if (resources[i].type() != Json::stringValue)
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1403 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1404 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1405 "The \"" + std::string(ORTHANC_RESOURCES) +
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1406 "\" field must provide an array of strings, found: " + resources[i].toStyledString());
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1407 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1408
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1409 std::list<std::string> instances;
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1410 context.GetIndex().GetChildInstances(instances, resources[i].asString());
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1411
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1412 for (std::list<std::string>::const_iterator
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1413 it = instances.begin(); it != instances.end(); ++it)
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1414 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1415 std::string sopClassUid, sopInstanceUid;
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1416 DicomMap tags;
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1417 if (context.LookupOrReconstructMetadata(sopClassUid, *it, MetadataType_Instance_SopClassUid) &&
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1418 context.GetIndex().GetAllMainDicomTags(tags, *it) &&
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1419 tags.LookupStringValue(sopInstanceUid, DICOM_TAG_SOP_INSTANCE_UID, false))
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1420 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1421 sopClassUids.push_back(sopClassUid);
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1422 sopInstanceUids.push_back(sopInstanceUid);
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1423 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1424 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1425 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1426 throw OrthancException(ErrorCode_InternalError,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1427 "Cannot retrieve SOP Class/Instance UID of Orthanc instance: " + *it);
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1428 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1429 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1430 }
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1431 }
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1432 }
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1433
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1434 if (json.isMember(DICOM_INSTANCES))
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1435 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1436 const Json::Value& instances = json[DICOM_INSTANCES];
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1437
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1438 if (instances.type() != Json::arrayValue)
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1439 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1440 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1441 "The \"" + std::string(DICOM_INSTANCES) +
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1442 "\" field must provide an array of DICOM instances");
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1443 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1444 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1445 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1446 for (Json::Value::ArrayIndex i = 0; i < instances.size(); i++)
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1447 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1448 if (instances[i].type() == Json::arrayValue)
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1449 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1450 if (instances[i].size() != 2 \|\|
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1451 instances[i][0].type() != Json::stringValue \|\|
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1452 instances[i][1].type() != Json::stringValue)
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1453 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1454 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1455 "An instance entry must provide an array with 2 strings: "
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1456 "SOP Class UID and SOP Instance UID");
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1457 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1458 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1459 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1460 sopClassUids.push_back(instances[i][0].asString());
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1461 sopInstanceUids.push_back(instances[i][1].asString());
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1462 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1463 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1464 else if (instances[i].type() == Json::objectValue)
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1465 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1466 if (!instances[i].isMember(SOP_CLASS_UID) \|\|
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1467 !instances[i].isMember(SOP_INSTANCE_UID) \|\|
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1468 instances[i][SOP_CLASS_UID].type() != Json::stringValue \|\|
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1469 instances[i][SOP_INSTANCE_UID].type() != Json::stringValue)
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1470 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1471 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1472 "An instance entry must provide an object with 2 string fiels: "
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1473 "\"" + std::string(SOP_CLASS_UID) + "\" and \"" +
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1474 std::string(SOP_INSTANCE_UID));
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1475 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1476 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1477 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1478 sopClassUids.push_back(instances[i][SOP_CLASS_UID].asString());
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1479 sopInstanceUids.push_back(instances[i][SOP_INSTANCE_UID].asString());
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1480 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1481 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1482 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1483 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1484 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1485 "JSON array or object is expected to specify one "
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1486 "instance to be queried, found: " + instances[i].toStyledString());
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1487 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1488 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1489 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1490 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1491
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1492 if (sopClassUids.size() != sopInstanceUids.size())
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1493 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1494 throw OrthancException(ErrorCode_InternalError);
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1495 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1496
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1497 const std::string transactionUid = Toolbox::GenerateDicomPrivateUniqueIdentifier();
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1498
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1499 if (sopClassUids.empty())
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1500 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1501 LOG(WARNING) << "Issuing an outgoing storage commitment request that is empty: " << transactionUid;
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1502 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1503
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1504 {
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1505 const RemoteModalityParameters remote =
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1506 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1507
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1508 const std::string& remoteAet = remote.GetApplicationEntityTitle();
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1509 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1510
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1511 // Create a "pending" storage commitment report BEFORE the
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1512 // actual SCU call in order to avoid race conditions
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1513 context.GetStorageCommitmentReports().Store(
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1514 transactionUid, new StorageCommitmentReports::Report(remoteAet));
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1515
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	1516 DicomAssociationParameters parameters(localAet, remote);
447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	1517
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1518 std::vector<std::string> a(sopClassUids.begin(), sopClassUids.end());
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1519 std::vector<std::string> b(sopInstanceUids.begin(), sopInstanceUids.end());
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	1520 DicomAssociation::RequestStorageCommitment(parameters, transactionUid, a, b);
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1521 }
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1522
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1523 Json::Value result = Json::objectValue;
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1524 result["ID"] = transactionUid;
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1525 result["Path"] = "/storage-commitment/" + transactionUid;
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1526 call.GetOutput().AnswerJson(result);
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1527 }
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1528 }
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1529
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1530
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1531 static void GetStorageCommitmentReport(RestApiGetCall& call)
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1532 {
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1533 ServerContext& context = OrthancRestApi::GetContext(call);
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1534
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1535 const std::string& transactionUid = call.GetUriComponent("id", "");
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1536
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1537 {
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1538 StorageCommitmentReports::Accessor accessor(
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1539 context.GetStorageCommitmentReports(), transactionUid);
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1540
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1541 if (accessor.IsValid())
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1542 {
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1543 Json::Value json;
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1544 accessor.GetReport().Format(json);
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1545 call.GetOutput().AnswerJson(json);
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1546 }
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1547 else
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1548 {
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1549 throw OrthancException(ErrorCode_InexistentItem,
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1550 "No storage commitment transaction with UID: " + transactionUid);
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1551 }
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1552 }
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1553 }
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1554
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1555
3738 bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1556 static void RemoveAfterStorageCommitment(RestApiPostCall& call)
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1557 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1558 ServerContext& context = OrthancRestApi::GetContext(call);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1559
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1560 const std::string& transactionUid = call.GetUriComponent("id", "");
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1561
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1562 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1563 StorageCommitmentReports::Accessor accessor(
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1564 context.GetStorageCommitmentReports(), transactionUid);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1565
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1566 if (!accessor.IsValid())
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1567 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1568 throw OrthancException(ErrorCode_InexistentItem,
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1569 "No storage commitment transaction with UID: " + transactionUid);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1570 }
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1571 else if (accessor.GetReport().GetStatus() != StorageCommitmentReports::Report::Status_Success)
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1572 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1573 throw OrthancException(ErrorCode_BadSequenceOfCalls,
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1574 "Cannot remove DICOM instances after failure "
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1575 "in storage commitment transaction: " + transactionUid);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1576 }
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1577 else
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1578 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1579 std::vector<std::string> sopInstanceUids;
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1580 accessor.GetReport().GetSuccessSopInstanceUids(sopInstanceUids);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1581
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1582 for (size_t i = 0; i < sopInstanceUids.size(); i++)
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1583 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1584 std::vector<std::string> orthancId;
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1585 context.GetIndex().LookupIdentifierExact(
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1586 orthancId, ResourceType_Instance, DICOM_TAG_SOP_INSTANCE_UID, sopInstanceUids[i]);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1587
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1588 for (size_t j = 0; j < orthancId.size(); j++)
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1589 {
4294 0923247e69f6 log categories: rest -> http + added lua & jobs Alain Mazy <alain@mazy.be> parents: 4272 diff changeset	1590 CLOG(INFO, HTTP) << "Storage commitment - Removing SOP instance UID / Orthanc ID: "
4272 1661544ea94d LogCategory_REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 4205 diff changeset	1591 << sopInstanceUids[i] << " / " << orthancId[j];
3738 bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1592
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1593 Json::Value tmp;
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1594 context.GetIndex().DeleteResource(tmp, orthancId[j], ResourceType_Instance);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1595 }
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1596 }
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1597
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1598 call.GetOutput().AnswerBuffer("{}", MimeType_Json);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1599 }
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1600 }
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1601 }
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1602
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1603
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1604 void OrthancRestApi::RegisterModalities()
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1605 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1606 Register("/modalities", ListModalities);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1607 Register("/modalities/{id}", ListModalityOperations);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1608 Register("/modalities/{id}", UpdateModality);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1609 Register("/modalities/{id}", DeleteModality);
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	1610 Register("/modalities/{id}/echo", DicomEcho);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1611 Register("/modalities/{id}/find-patient", DicomFindPatient);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1612 Register("/modalities/{id}/find-study", DicomFindStudy);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1613 Register("/modalities/{id}/find-series", DicomFindSeries);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1614 Register("/modalities/{id}/find-instance", DicomFindInstance);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1615 Register("/modalities/{id}/find", DicomFind);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1616 Register("/modalities/{id}/store", DicomStore);
3808 7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1617 Register("/modalities/{id}/store-straight", DicomStoreStraight); // New in 1.6.1
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1618 Register("/modalities/{id}/move", DicomMove);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1619
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1620 // For Query/Retrieve
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1621 Register("/modalities/{id}/query", DicomQuery);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1622 Register("/queries", ListQueries);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1623 Register("/queries/{id}", DeleteQuery);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1624 Register("/queries/{id}", ListQueryOperations);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1625 Register("/queries/{id}/answers", ListQueryAnswers);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1626 Register("/queries/{id}/answers/{index}", ListQueryAnswerOperations);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1627 Register("/queries/{id}/answers/{index}/content", GetQueryOneAnswer);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1628 Register("/queries/{id}/answers/{index}/retrieve", RetrieveOneAnswer);
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1629 Register("/queries/{id}/answers/{index}/query-instances",
2986 b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	1630 QueryAnswerChildren<ResourceType_Instance>);
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1631 Register("/queries/{id}/answers/{index}/query-series",
2986 b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	1632 QueryAnswerChildren<ResourceType_Series>);
2982 94c8222c52b7 New URIs to launch new C-FIND to explore the hierarchy of a C-FIND answer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1633 Register("/queries/{id}/answers/{index}/query-studies",
2986 b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	1634 QueryAnswerChildren<ResourceType_Study>);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1635 Register("/queries/{id}/level", GetQueryLevel);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1636 Register("/queries/{id}/modality", GetQueryModality);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1637 Register("/queries/{id}/query", GetQueryArguments);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1638 Register("/queries/{id}/retrieve", RetrieveAllAnswers);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1639
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1640 Register("/peers", ListPeers);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1641 Register("/peers/{id}", ListPeerOperations);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1642 Register("/peers/{id}", UpdatePeer);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1643 Register("/peers/{id}", DeletePeer);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1644 Register("/peers/{id}/store", PeerStore);
3592 de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1645 Register("/peers/{id}/system", PeerSystem);
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1646
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1647 Register("/modalities/{id}/find-worklist", DicomFindWorklist);
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1648
3738 bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1649 // Storage commitment
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1650 Register("/modalities/{id}/storage-commitment", StorageCommitmentScu);
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1651 Register("/storage-commitment/{id}", GetStorageCommitmentReport);
3738 bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1652 Register("/storage-commitment/{id}/remove", RemoveAfterStorageCommitment);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1653 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1654 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp @ 4294:0923247e69f6