orthanc: OrthancServer/OrthancRestApi/OrthancRestModalities.cpp annotate

annotate OrthancServer/OrthancRestApi/OrthancRestModalities.cpp @ 3830:447880856ce8

removing deprecated DicomUserControl from OrthancRestModalities.cpp

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 10 Apr 2020 17:29:11 +0200
parents	7f083dfae62b
children	9973d10bc5c4

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
3095 beeeb6096f27 removing dependencies upon ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	37 #include "../../Core/Cache/SharedArchive.h"
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	38 #include "../../Core/DicomNetworking/DicomAssociation.h"
447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	39 #include "../../Core/DicomNetworking/DicomControlUserConnection.h"
2602 c25f1a52acbc reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2589 diff changeset	40 #include "../../Core/DicomParsing/FromDcmtkBridge.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	41 #include "../../Core/Logging.h"
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	42 #include "../../Core/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";
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	57 static const char* const KEY_QUERY = "Query";
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";
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	59 static const char* const KEY_RESOURCES = "Resources";
3808 7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	60 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	61 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	62
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	63
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	64 static RemoteModalityParameters MyGetModalityUsingSymbolicName(const std::string& name)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	65 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	66 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	67 return lock.GetConfiguration().GetModalityUsingSymbolicName(name);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	68 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	69
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	70
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	71 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	72 * DICOM C-Echo SCU
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	73 ***************************************************************************/
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	74
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	75 static void DicomEcho(RestApiPostCall& call)
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	76 {
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	77 ServerContext& context = OrthancRestApi::GetContext(call);
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	78
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	79 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	80 RemoteModalityParameters remote =
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	81 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	82
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	83 try
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	84 {
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	85 DicomControlUserConnection connection(localAet, remote);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	86
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	87 if (connection.Echo())
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	88 {
1165 0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	89 // Echo has succeeded
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	90 call.GetOutput().AnswerBuffer("{}", MimeType_Json);
1165 0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	91 return;
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	92 }
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	93 }
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	94 catch (OrthancException&)
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	95 {
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	96 }
1165 0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	97
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	98 // Echo has failed
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	99 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	100 }
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	101
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	102
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	103
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	104 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	105 * DICOM C-Find SCU => DEPRECATED!
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	106 ***************************************************************************/
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	107
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	108 static bool MergeQueryAndTemplate(DicomMap& result,
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	109 const RestApiCall& call)
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 Json::Value query;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	112
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	113 if (!call.ParseJsonRequest(query) \|\|
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	114 query.type() != Json::objectValue)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	115 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	116 return false;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	117 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	118
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	119 Json::Value::Members members = query.getMemberNames();
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	120 for (size_t i = 0; i < members.size(); i++)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	121 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	122 DicomTag t = FromDcmtkBridge::ParseTag(members[i]);
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	123 result.SetValue(t, query[members[i]].asString(), false);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	124 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	125
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	126 return true;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	127 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	128
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	129
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	130 static void FindPatient(DicomFindAnswers& result,
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	131 DicomControlUserConnection& connection,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	132 const DicomMap& fields)
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 // 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	135 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	136 fields.ExtractPatientInformation(s);
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	137 connection.Find(result, ResourceType_Patient, s, true /* normalize */);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	138 }
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
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	141 static void FindStudy(DicomFindAnswers& result,
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	142 DicomControlUserConnection& connection,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	143 const DicomMap& fields)
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 // 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	146 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	147 fields.ExtractStudyInformation(s);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	148
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	149 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	150 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	151 s.CopyTagIfExists(fields, DICOM_TAG_MODALITIES_IN_STUDY);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	152
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	153 connection.Find(result, ResourceType_Study, s, true /* normalize */);
1368 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
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	156 static void FindSeries(DicomFindAnswers& result,
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	157 DicomControlUserConnection& connection,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	158 const DicomMap& fields)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	159 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	160 // 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	161 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	162 fields.ExtractSeriesInformation(s);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	163
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	164 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	165 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	166 s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	167
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	168 connection.Find(result, ResourceType_Series, s, true /* normalize */);
1368 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
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	171 static void FindInstance(DicomFindAnswers& result,
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	172 DicomControlUserConnection& connection,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	173 const DicomMap& fields)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	174 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	175 // 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	176 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	177 fields.ExtractInstanceInformation(s);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	178
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	179 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	180 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	181 s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	182 s.CopyTagIfExists(fields, DICOM_TAG_SERIES_INSTANCE_UID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	183
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	184 connection.Find(result, ResourceType_Instance, s, true /* normalize */);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	185 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	186
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	187
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	188 static void DicomFindPatient(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	190 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	191 ServerContext& context = OrthancRestApi::GetContext(call);
3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	192
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	193 DicomMap fields;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	194 DicomMap::SetupFindPatientTemplate(fields);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	195 if (!MergeQueryAndTemplate(fields, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	196 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199
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	200 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	201 RemoteModalityParameters remote =
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	202 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	203
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	204 DicomFindAnswers answers(false);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	206 {
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	207 DicomControlUserConnection connection(localAet, remote);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	208 FindPatient(answers, connection, fields);
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	209 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 Json::Value result;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	212 answers.ToJson(result, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	216 static void DicomFindStudy(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	218 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	219 ServerContext& context = OrthancRestApi::GetContext(call);
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::SetupFindStudyTemplate(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
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	228 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	229 fields.GetValue(DICOM_TAG_PATIENT_ID).GetContent().size() <= 2)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233
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	234 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	235 RemoteModalityParameters remote =
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	236 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	237
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	238 DicomFindAnswers answers(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	239
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	240 {
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	241 DicomControlUserConnection connection(localAet, remote);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	242 FindStudy(answers, connection, fields);
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	243 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 Json::Value result;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	246 answers.ToJson(result, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	250 static void DicomFindSeries(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	252 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	253 ServerContext& context = OrthancRestApi::GetContext(call);
3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	254
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	255 DicomMap fields;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	256 DicomMap::SetupFindSeriesTemplate(fields);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	257 if (!MergeQueryAndTemplate(fields, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	262 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	263 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	264 fields.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent().size() <= 2)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 return;
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
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	269 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	270 RemoteModalityParameters remote =
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	271 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	272
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	273 DicomFindAnswers answers(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	274
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	275 {
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	276 DicomControlUserConnection connection(localAet, remote);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	277 FindSeries(answers, connection, fields);
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	278 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280 Json::Value result;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	281 answers.ToJson(result, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282 call.GetOutput().AnswerJson(result);
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
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	285 static void DicomFindInstance(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	287 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	288 ServerContext& context = OrthancRestApi::GetContext(call);
3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	289
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	290 DicomMap fields;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	291 DicomMap::SetupFindInstanceTemplate(fields);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	292 if (!MergeQueryAndTemplate(fields, call))
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 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	297 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	298 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	299 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	300 fields.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).GetContent().size() <= 2)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304
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	305 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	306 RemoteModalityParameters remote =
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	307 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	308
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	309 DicomFindAnswers answers(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	310
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	311 {
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	312 DicomControlUserConnection connection(localAet, remote);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	313 FindInstance(answers, connection, fields);
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	314 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316 Json::Value result;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	317 answers.ToJson(result, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	321
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	322 static void CopyTagIfExists(DicomMap& target,
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	323 ParsedDicomFile& source,
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	324 const DicomTag& tag)
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	325 {
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	326 std::string tmp;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	327 if (source.GetTagValue(tmp, tag))
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	328 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	329 target.SetValue(tag, tmp, false);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	330 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	331 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	332
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	333
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	334 static void DicomFind(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	336 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	337 ServerContext& context = OrthancRestApi::GetContext(call);
3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	338
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339 DicomMap m;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340 DicomMap::SetupFindPatientTemplate(m);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	341 if (!MergeQueryAndTemplate(m, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345
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	346 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	347 RemoteModalityParameters remote =
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	348 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	349
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	350 DicomControlUserConnection connection(localAet, remote);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	351
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	352 DicomFindAnswers patients(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	353 FindPatient(patients, connection, m);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 // Loop over the found patients
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 Json::Value result = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 for (size_t i = 0; i < patients.GetSize(); i++)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	359 Json::Value patient;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	360 patients.ToJson(patient, i, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 DicomMap::SetupFindStudyTemplate(m);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	363 if (!MergeQueryAndTemplate(m, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366 }
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	367
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	368 CopyTagIfExists(m, patients.GetAnswer(i), DICOM_TAG_PATIENT_ID);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	370 DicomFindAnswers studies(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	371 FindStudy(studies, connection, m);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 patient["Studies"] = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	375 // Loop over the found studies
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	376 for (size_t j = 0; j < studies.GetSize(); j++)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	378 Json::Value study;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	379 studies.ToJson(study, j, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 DicomMap::SetupFindSeriesTemplate(m);
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	382 if (!MergeQueryAndTemplate(m, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 }
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	386
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	387 CopyTagIfExists(m, studies.GetAnswer(j), DICOM_TAG_PATIENT_ID);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	388 CopyTagIfExists(m, studies.GetAnswer(j), DICOM_TAG_STUDY_INSTANCE_UID);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	390 DicomFindAnswers series(false);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	391 FindSeries(series, connection, m);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 // Loop over the found series
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 study["Series"] = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 for (size_t k = 0; k < series.GetSize(); k++)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	397 Json::Value series2;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	398 series.ToJson(series2, k, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 study["Series"].append(series2);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402 patient["Studies"].append(study);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 }
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 result.append(patient);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 }
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
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	412
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	413 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	414 * 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	415 ***************************************************************************/
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	416
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	417 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	418 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	419 {
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	420 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	421
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	422 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	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 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	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
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 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	428
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 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	430 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	431 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	432 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	433
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 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	435 }
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
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
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	438 static void DicomQuery(RestApiPostCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	439 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	440 ServerContext& context = OrthancRestApi::GetContext(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	441 Json::Value request;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	442
3345 f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	443 if (!call.ParseJsonRequest(request) \|\|
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	444 request.type() != Json::objectValue)
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	445 {
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	446 throw OrthancException(ErrorCode_BadFileFormat, "Must provide a JSON object");
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	447 }
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	448 else if (!request.isMember(KEY_LEVEL) \|\|
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	449 request[KEY_LEVEL].type() != Json::stringValue)
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	450 {
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	451 throw OrthancException(ErrorCode_BadFileFormat,
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	452 "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	453 }
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	454 else if (request.isMember(KEY_NORMALIZE) &&
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	455 request[KEY_NORMALIZE].type() != Json::booleanValue)
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	456 {
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	457 throw OrthancException(ErrorCode_BadFileFormat,
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	458 "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	459 }
3345 f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	460 else if (request.isMember(KEY_QUERY) &&
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	461 request[KEY_QUERY].type() != Json::objectValue)
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	462 {
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	463 throw OrthancException(ErrorCode_BadFileFormat,
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	464 "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	465 }
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	466 else
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	467 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	468 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	469
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	470 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	471 handler->SetLevel(StringToResourceType(request[KEY_LEVEL].asCString()));
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	472
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	473 if (request.isMember(KEY_QUERY))
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	474 {
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 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	476 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	477
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	478 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	479 it = query.begin(); it != query.end(); ++it)
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	480 {
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	481 handler->SetQuery(it->first, it->second);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	482 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	483 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	484
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	485 if (request.isMember(KEY_NORMALIZE))
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	486 {
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	487 handler->SetFindNormalized(request[KEY_NORMALIZE].asBool());
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	488 }
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	489
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	490 AnswerQueryHandler(call, handler);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	491 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	492 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	493
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	494
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	495 static void ListQueries(RestApiGetCall& call)
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 ServerContext& context = OrthancRestApi::GetContext(call);
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 std::list<std::string> queries;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	500 context.GetQueryRetrieveArchive().List(queries);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	501
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	502 Json::Value result = Json::arrayValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	503 for (std::list<std::string>::const_iterator
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	504 it = queries.begin(); it != queries.end(); ++it)
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 result.append(*it);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	507 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	508
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	509 call.GetOutput().AnswerJson(result);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	510 }
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 namespace
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 class QueryAccessor
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 private:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	518 ServerContext& context_;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	519 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	520 QueryRetrieveHandler* handler_;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	521
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	522 public:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	523 QueryAccessor(RestApiCall& call) :
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	524 context_(OrthancRestApi::GetContext(call)),
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	525 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	526 handler_(NULL)
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	527 {
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	528 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	529 {
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_ = &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	531 }
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 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	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 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	535 }
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	536 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	537
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	538 QueryRetrieveHandler& GetHandler() const
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	539 {
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	540 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	541 return *handler_;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	542 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	543 };
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	544
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	545 static void AnswerDicomMap(RestApiCall& call,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	546 const DicomMap& value,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	547 bool simplify)
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 Json::Value full = Json::objectValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	550 FromDcmtkBridge::ToJson(full, value, simplify);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	551 call.GetOutput().AnswerJson(full);
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 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	554
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	555
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	556 static void ListQueryAnswers(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	557 {
2948 d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	558 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	559 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	560
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	561 QueryAccessor query(call);
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	562 size_t count = query.GetHandler().GetAnswersCount();
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	563
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	564 Json::Value result = Json::arrayValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	565 for (size_t i = 0; i < count; i++)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	566 {
2948 d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	567 if (expand)
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	568 {
2988 9cc3d40e389b Orthanc 1.4.3 is now known as 1.5.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2986 diff changeset	569 // 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	570 DicomMap value;
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	571 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	572
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	573 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	574 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	575
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	576 result.append(json);
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	577 }
d2e548e643af New options to URI "/queries/.../answers": "?expand" and "?limit" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	578 else
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(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	581 }
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	582 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	583
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	584 call.GetOutput().AnswerJson(result);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	585 }
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 static void GetQueryOneAnswer(RestApiGetCall& call)
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 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	591
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	592 QueryAccessor query(call);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	593
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	594 DicomMap map;
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	595 query.GetHandler().GetAnswer(map, index);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	596
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	597 AnswerDicomMap(call, map, call.HasArgument("simplify"));
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	598 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	599
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	600
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	601 static void SubmitRetrieveJob(RestApiPostCall& call,
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	602 bool allAnswers,
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	603 size_t index)
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	604 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	605 ServerContext& context = OrthancRestApi::GetContext(call);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	606
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	607 std::string targetAet;
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 Json::Value body;
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	610 if (call.ParseJsonRequest(body))
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	611 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	612 targetAet = SerializationToolbox::ReadString(body, "TargetAet");
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 else
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	615 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	616 body = Json::objectValue;
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	617 call.BodyToString(targetAet);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	618 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	619
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	620 std::unique_ptr<DicomMoveScuJob> job(new DicomMoveScuJob(context));
2867 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 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	623 QueryAccessor query(call);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	624 job->SetTargetAet(targetAet);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	625 job->SetLocalAet(query.GetHandler().GetLocalAet());
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	626 job->SetRemoteModality(query.GetHandler().GetRemoteModality());
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	627
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	628 LOG(WARNING) << "Driving C-Move SCU on remote modality "
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	629 << query.GetHandler().GetRemoteModality().GetApplicationEntityTitle()
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	630 << " to target modality " << targetAet;
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 if (allAnswers)
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	633 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	634 for (size_t i = 0; i < query.GetHandler().GetAnswersCount(); i++)
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 job->AddFindAnswer(query.GetHandler(), i);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	637 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	638 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	639 else
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	640 {
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	641 job->AddFindAnswer(query.GetHandler(), index);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	642 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	643 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	644
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	645 OrthancRestApi::GetApi(call).SubmitCommandsJob
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	646 (call, job.release(), true /* synchronous by default */, body);
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	647 }
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	648
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	649
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	650 static void RetrieveOneAnswer(RestApiPostCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	651 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	652 size_t index = boost::lexical_cast<size_t>(call.GetUriComponent("index", ""));
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	653 SubmitRetrieveJob(call, false, index);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	654 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	655
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	656
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	657 static void RetrieveAllAnswers(RestApiPostCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	658 {
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	659 SubmitRetrieveJob(call, true, 0);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	660 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	661
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	662
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	663 static void GetQueryArguments(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	664 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	665 QueryAccessor query(call);
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	666 AnswerDicomMap(call, query.GetHandler().GetQuery(), call.HasArgument("simplify"));
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	667 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	668
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	669
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	670 static void GetQueryLevel(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	671 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	672 QueryAccessor query(call);
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	673 call.GetOutput().AnswerBuffer(EnumerationToString(query.GetHandler().GetLevel()), MimeType_PlainText);
1368 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
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	677 static void GetQueryModality(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	678 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	679 QueryAccessor query(call);
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	680 call.GetOutput().AnswerBuffer(query.GetHandler().GetModalitySymbolicName(), MimeType_PlainText);
1368 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
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 static void DeleteQuery(RestApiDeleteCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	685 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	686 ServerContext& context = OrthancRestApi::GetContext(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	687 context.GetQueryRetrieveArchive().Remove(call.GetUriComponent("id", ""));
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	688 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	689 }
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
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	692 static void ListQueryOperations(RestApiGetCall& call)
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 // Ensure that the query of interest does exist
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	695 QueryAccessor query(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	696
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	697 RestApi::AutoListChildren(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	698 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	699
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 static void ListQueryAnswerOperations(RestApiGetCall& call)
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 // Ensure that the query of interest does exist
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	704 QueryAccessor query(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	705
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	706 // Ensure that the answer of interest does exist
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	707 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	708
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	709 DicomMap map;
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2843 diff changeset	710 query.GetHandler().GetAnswer(map, index);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	711
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	712 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	713 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	714 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	715
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	716 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	717 {
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	718 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	719 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	720
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	721 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	722 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	723
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	724 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	725 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	726 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	727
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	728 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	729 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	730 }
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
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 call.GetOutput().AnswerJson(answer);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	733 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	734
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	735
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	736 template <ResourceType CHILDREN_LEVEL>
2986 b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	737 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	738 {
2988 9cc3d40e389b Orthanc 1.4.3 is now known as 1.5.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2986 diff changeset	739 // 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	740 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	741 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	742 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	743
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 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	745
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	746 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	747
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 {
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 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	750 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	751
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	752 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	753
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	754 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	755
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	756 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	757 {
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	758 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	759 }
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 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	761 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	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 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	764 }
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	765 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	766 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	767 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	768 {
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 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	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 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	772 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	773 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	774 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	775 {
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 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	777 }
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 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	779 {
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 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	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 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	783 {
3370 872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3345 diff changeset	784 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	785 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	786 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	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 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	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 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	791 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	792
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 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	794 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	795 {
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 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	797 }
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 }
2986 b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	799
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	800 DicomMap answer;
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	801 parent.GetHandler().GetAnswer(answer, index);
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	802
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	803 // 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	804 switch (parent.GetHandler().GetLevel())
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	805 {
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	806 case ResourceType_Patient:
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	807 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	808 break;
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	809
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	810 case ResourceType_Study:
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	811 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	812 break;
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	813
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	814 case ResourceType_Series:
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	815 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	816 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	817 break;
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 case ResourceType_Instance:
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	820 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	821 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	822 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	823 break;
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 default:
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	826 throw OrthancException(ErrorCode_InternalError);
b1ba0a8311b5 exploring hierarchy of C-FIND answers finished Sebastien Jodogne <s.jodogne@gmail.com> parents: 2982 diff changeset	827 }
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	828 }
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	829 }
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	830
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	831 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	832 }
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	833
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	834
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	835
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	836 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	837 * DICOM C-Store SCU
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	838 ***************************************************************************/
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	839
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	840 static void GetInstancesToExport(Json::Value& otherArguments,
2626 e09021ddc00d cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 2624 diff changeset	841 SetOfInstancesJob& job,
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	842 const std::string& remote,
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	843 RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	844 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	845 otherArguments = Json::objectValue;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	846 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	847
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	848 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	849 if (Toolbox::IsSHA1(call.GetBodyData(), call.GetBodySize()))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	850 {
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	851 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	852 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	853
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	854 // This is for compatibility with Orthanc <= 0.5.1.
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	855 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	856 request.append(Toolbox::StripSpaces(s));
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	858 else if (!call.ParseJsonRequest(request))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	859 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	860 // 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	861 throw OrthancException(ErrorCode_BadFileFormat, "Must provide a JSON value");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	862 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	864 if (request.isString())
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	865 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	866 std::string item = request.asString();
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	867 request = Json::arrayValue;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	868 request.append(item);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	869 }
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	870 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	871 !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	872 {
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	873 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	874 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	875
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	876 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	877 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	878 {
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	879 resources = &request;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	880 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	881 else
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	882 {
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	883 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	884 !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	885 {
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	886 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	887 "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	888 }
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	889
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	890 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	891 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	892 {
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	893 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	894 "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	895 }
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	896
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	897 // Copy the remaining arguments
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	898 Json::Value::Members members = request.getMemberNames();
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	899 for (Json::Value::ArrayIndex i = 0; i < members.size(); i++)
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	900 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	901 otherArguments[members[i]] = request[members[i]];
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	902 }
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	903 }
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
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	905 bool logExportedResources;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	906
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	907 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	908 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	909 logExportedResources = lock.GetConfiguration().GetBooleanParameter("LogExportedResources", false);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	910 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	911
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	912 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	913 {
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 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	915 {
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	916 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	917 "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	918 }
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	919
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	920 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	921 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	922 {
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	923 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	924 "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	925 }
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	926
3374 d0d6bd633e4c Reporting of "ParentResources" in "DicomModalityStore" and "DicomModalityStore" jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3370 diff changeset	927 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	928
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	929 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	930
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	931 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	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 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	934 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	935 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	936 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	937
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	938
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	939 static void DicomStore(RestApiPostCall& call)
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	940 {
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	941 ServerContext& context = OrthancRestApi::GetContext(call);
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	942
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	943 std::string remote = call.GetUriComponent("id", "");
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	944
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	945 Json::Value request;
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	946 std::unique_ptr<DicomModalityStoreJob> job(new DicomModalityStoreJob(context));
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 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 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	949
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	950 std::string localAet = 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	951 (request, "LocalAet", 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	952 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	953 (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	954 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	955 (request, "MoveOriginatorID", 0 /* By default, not a C-MOVE */);
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	956
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	957 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	958 job->SetRemoteModality(MyGetModalityUsingSymbolicName(remote));
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	959
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	960 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	961 {
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	962 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	963 }
2626 e09021ddc00d cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 2624 diff changeset	964
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	965 // New in Orthanc 1.6.0
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	966 if (Toolbox::GetJsonBooleanField(request, "StorageCommitment", false))
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	967 {
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	968 job->EnableStorageCommitment(true);
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	969 }
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	970
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 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	972 (call, job.release(), true /* synchronous by default */, request);
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	973 }
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	974
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	975
3808 7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	976 static void DicomStoreStraight(RestApiPostCall& call)
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	977 {
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	978 ServerContext& context = OrthancRestApi::GetContext(call);
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	979
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	980 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	981 RemoteModalityParameters remote =
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	982 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	983
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	984 DicomUserConnection connection(localAet, remote);
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	985 connection.Open();
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	986
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	987 std::string sopClassUid, sopInstanceUid;
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	988 connection.Store(sopClassUid, sopInstanceUid,
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	989 call.GetBodyData(), call.GetBodySize());
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	990
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	991 Json::Value answer = Json::objectValue;
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	992 answer[SOP_CLASS_UID] = sopClassUid;
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	993 answer[SOP_INSTANCE_UID] = sopInstanceUid;
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	994
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	995 call.GetOutput().AnswerJson(answer);
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	996 }
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	997
7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	998
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	999 /***************************************************************************
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1000 * 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	1001 ***************************************************************************/
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1002
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1003 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	1004 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1005 ServerContext& context = OrthancRestApi::GetContext(call);
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1006
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1007 Json::Value request;
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1008
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1009 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	1010 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	1011 !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	1012 !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	1013 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	1014 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	1015 {
3345 f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	1016 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	1017 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	1018 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1019
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	1020 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	1021
2584 38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	1022 std::string localAet = Toolbox::GetJsonStringField
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	1023 (request, "LocalAet", context.GetDefaultLocalApplicationEntityTitle());
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	1024 std::string targetAet = Toolbox::GetJsonStringField
38b5045f2bff refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2583 diff changeset	1025 (request, "TargetAet", context.GetDefaultLocalApplicationEntityTitle());
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1026
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	1027 const RemoteModalityParameters source =
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1028 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	1029
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	1030 DicomControlUserConnection connection(localAet, source);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	1031
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	1032 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	1033 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1034 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	1035 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	1036
a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	1037 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	1038 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1039
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1040 // Move has succeeded
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1041 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	1042 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1043
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1044
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1045
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	1046 /***************************************************************************
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1047 * Orthanc Peers => Store client
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1048 ***************************************************************************/
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1049
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1050 static bool IsExistingPeer(const OrthancRestApi::SetOfStrings& peers,
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1051 const std::string& id)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1052 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1053 return peers.find(id) != peers.end();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1054 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1055
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1056 static void ListPeers(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1057 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1058 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1059
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1060 OrthancRestApi::SetOfStrings peers;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1061 lock.GetConfiguration().GetListOfOrthancPeers(peers);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1062
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1063 if (call.HasArgument("expand"))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1064 {
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1065 Json::Value result = Json::objectValue;
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1066 for (OrthancRestApi::SetOfStrings::const_iterator
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1067 it = peers.begin(); it != peers.end(); ++it)
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1068 {
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1069 WebServiceParameters peer;
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2685 diff changeset	1070
2944 f395460af74d simplifying OrthancConfiguration for modalities/peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1071 if (lock.GetConfiguration().LookupOrthancPeer(peer, *it))
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1072 {
3192 595bfee4391a URI "/peers?expand" provides more information Sebastien Jodogne <s.jodogne@gmail.com> parents: 3167 diff changeset	1073 Json::Value info;
595bfee4391a URI "/peers?expand" provides more information Sebastien Jodogne <s.jodogne@gmail.com> parents: 3167 diff changeset	1074 peer.FormatPublic(info);
595bfee4391a URI "/peers?expand" provides more information Sebastien Jodogne <s.jodogne@gmail.com> parents: 3167 diff changeset	1075 result[*it] = info;
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1076 }
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1077 }
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1078 call.GetOutput().AnswerJson(result);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1079 }
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1080 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	1081 {
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1082 Json::Value result = Json::arrayValue;
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1083 for (OrthancRestApi::SetOfStrings::const_iterator
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1084 it = peers.begin(); it != peers.end(); ++it)
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1085 {
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1086 result.append(*it);
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1087 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1088
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1089 call.GetOutput().AnswerJson(result);
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1090 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1091 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1092
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1093 static void ListPeerOperations(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1094 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1095 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1096
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1097 OrthancRestApi::SetOfStrings peers;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1098 lock.GetConfiguration().GetListOfOrthancPeers(peers);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1099
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1100 std::string id = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1101 if (IsExistingPeer(peers, id))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1102 {
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	1103 RestApi::AutoListChildren(call);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1104 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1105 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1106
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1107 static void PeerStore(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1108 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1109 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1110
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1111 std::string remote = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1112
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	1113 Json::Value request;
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1114 std::unique_ptr<OrthancPeerStoreJob> job(new OrthancPeerStoreJob(context));
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1115
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1116 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	1117
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1118 OrthancConfiguration::ReaderLock lock;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1119
3167 860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1120 WebServiceParameters peer;
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1121 if (lock.GetConfiguration().LookupOrthancPeer(peer, remote))
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1122 {
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1123 job->SetPeer(peer);
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1124 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	1125 (call, job.release(), true /* synchronous by default */, request);
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1126 }
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1127 else
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1128 {
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1129 throw OrthancException(ErrorCode_UnknownResource,
860aed8258c3 Fix issue #73 (/modalities/{modalityId}/store raises 500 errors instead of 404) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	1130 "No peer with symbolic name: " + remote);
2626 e09021ddc00d cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 2624 diff changeset	1131 }
751 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
3592 de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1134 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	1135 {
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1136 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	1137
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1138 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	1139
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1140 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	1141 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	1142 {
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1143 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	1144 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	1145
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1146 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	1147
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1148 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	1149 {
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1150 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	1151 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	1152 return;
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1153 }
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1154
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1155 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	1156 }
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1157 else
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1158 {
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1159 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	1160 "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	1161 }
de1665e7b341 added '/peers/{id}/system' route to test the connectivity with a remote peer Alain Mazy <alain@mazy.be> parents: 3401 diff changeset	1162 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1163
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1164 // DICOM bridge -------------------------------------------------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1165
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1166 static bool IsExistingModality(const OrthancRestApi::SetOfStrings& modalities,
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1167 const std::string& id)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1168 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1169 return modalities.find(id) != modalities.end();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1170 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1171
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1172 static void ListModalities(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1173 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1174 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1175
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1176 OrthancRestApi::SetOfStrings modalities;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1177 lock.GetConfiguration().GetListOfDicomModalities(modalities);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1178
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1179 if (call.HasArgument("expand"))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1180 {
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1181 Json::Value result = Json::objectValue;
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1182 for (OrthancRestApi::SetOfStrings::const_iterator
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1183 it = modalities.begin(); it != modalities.end(); ++it)
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1184 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1185 const RemoteModalityParameters& remote = lock.GetConfiguration().GetModalityUsingSymbolicName(*it);
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1186
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1187 Json::Value info;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1188 remote.Serialize(info, true /* force advanced format */);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1189 result[*it] = info;
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1190 }
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1191 call.GetOutput().AnswerJson(result);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1192 }
2441 67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1193 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	1194 {
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1195 Json::Value result = Json::arrayValue;
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1196 for (OrthancRestApi::SetOfStrings::const_iterator
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1197 it = modalities.begin(); it != modalities.end(); ++it)
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1198 {
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1199 result.append(*it);
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1200 }
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1201 call.GetOutput().AnswerJson(result);
67c01a6f151e added ?expand argument to /peers and /modalities routes amazy parents: 2382 diff changeset	1202 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1203 }
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
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1206 static void ListModalityOperations(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1207 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1208 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1209
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1210 OrthancRestApi::SetOfStrings modalities;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1211 lock.GetConfiguration().GetListOfDicomModalities(modalities);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1212
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1213 std::string id = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1214 if (IsExistingModality(modalities, id))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1215 {
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	1216 RestApi::AutoListChildren(call);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1217 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1218 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1219
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1220
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1221 static void UpdateModality(RestApiPutCall& call)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1222 {
2801 3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1223 ServerContext& context = OrthancRestApi::GetContext(call);
3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1224
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1225 Json::Value json;
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	1226 if (call.ParseJsonRequest(json))
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1227 {
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1228 RemoteModalityParameters modality;
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1229 modality.Unserialize(json);
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1230
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1231 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1232 OrthancConfiguration::WriterLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1233 lock.GetConfiguration().UpdateModality(call.GetUriComponent("id", ""), modality);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1234 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1235
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1236 context.SignalUpdatedModalities();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1237
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1238 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1239 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1240 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1241
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1242
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1243 static void DeleteModality(RestApiDeleteCall& call)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1244 {
2801 3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1245 ServerContext& context = OrthancRestApi::GetContext(call);
3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1246
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1247 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1248 OrthancConfiguration::WriterLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1249 lock.GetConfiguration().RemoveModality(call.GetUriComponent("id", ""));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1250 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1251
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1252 context.SignalUpdatedModalities();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1253
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1254 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1255 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1256
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1257
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1258 static void UpdatePeer(RestApiPutCall& call)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1259 {
2801 3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1260 ServerContext& context = OrthancRestApi::GetContext(call);
3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1261
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1262 Json::Value json;
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3374 diff changeset	1263 if (call.ParseJsonRequest(json))
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1264 {
2020 a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	1265 WebServiceParameters peer;
2800 dc7330089736 "OrthancPeers" configuration option now allows to specify HTTP headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1266 peer.Unserialize(json);
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1267
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1268 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1269 OrthancConfiguration::WriterLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1270 lock.GetConfiguration().UpdatePeer(call.GetUriComponent("id", ""), peer);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1271 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1272
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1273 context.SignalUpdatedPeers();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1274
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1275 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1276 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1277 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1278
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1279
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1280 static void DeletePeer(RestApiDeleteCall& call)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1281 {
2801 3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1282 ServerContext& context = OrthancRestApi::GetContext(call);
3ee82c7313e7 New events in change callbacks: "UpdatedPeers" and "UpdatedModalities" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2800 diff changeset	1283
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1284 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1285 OrthancConfiguration::WriterLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1286 lock.GetConfiguration().RemovePeer(call.GetUriComponent("id", ""));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1287 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1288
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1289 context.SignalUpdatedPeers();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1290
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1291 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1292 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1293
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1294
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1295 static void DicomFindWorklist(RestApiPostCall& call)
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1296 {
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1297 ServerContext& context = OrthancRestApi::GetContext(call);
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1298
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1299 Json::Value json;
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1300 if (call.ParseJsonRequest(json))
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1301 {
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1302 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1303 const RemoteModalityParameters remote =
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	1304 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1305
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1306 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	1307 (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	1308 "" /* no private creator */));
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1309
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	1310 DicomFindAnswers answers(true);
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1311
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1312 {
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	1313 DicomControlUserConnection connection(localAet, remote);
2589 a3fdfb6979ed getting rid of ReusableDicomConnection in REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2587 diff changeset	1314 connection.FindWorklist(answers, *query);
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1315 }
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1316
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1317 Json::Value result;
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1318 answers.ToJson(result, true);
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1319 call.GetOutput().AnswerJson(result);
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1320 }
3345 f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	1321 else
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	1322 {
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	1323 throw OrthancException(ErrorCode_BadFileFormat, "Must provide a JSON object");
f687e11aeb13 more explicit HTTP errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 3192 diff changeset	1324 }
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1325 }
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1326
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1327
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1328 // Storage commitment SCU ---------------------------------------------------
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1329
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1330 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	1331 {
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1332 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	1333 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	1334
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1335 ServerContext& context = OrthancRestApi::GetContext(call);
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1336
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1337 Json::Value json;
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1338 if (!call.ParseJsonRequest(json) \|\|
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1339 json.type() != Json::objectValue)
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1340 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1341 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1342 "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	1343 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1344 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	1345 !json.isMember(DICOM_INSTANCES))
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1346 {
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1347 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1348 "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	1349 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	1350 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1351 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1352 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1353 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	1354
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1355 if (json.isMember(ORTHANC_RESOURCES))
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1356 {
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1357 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	1358
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1359 if (resources.type() != Json::arrayValue)
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1360 {
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1361 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1362 "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	1363 "\" 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	1364 }
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1365 else
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1366 {
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1367 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	1368 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1369 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	1370 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1371 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1372 "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	1373 "\" 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	1374 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1375
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1376 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	1377 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	1378
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1379 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	1380 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	1381 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1382 std::string sopClassUid, sopInstanceUid;
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1383 DicomMap tags;
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1384 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	1385 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	1386 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	1387 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1388 sopClassUids.push_back(sopClassUid);
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1389 sopInstanceUids.push_back(sopInstanceUid);
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1390 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1391 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1392 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1393 throw OrthancException(ErrorCode_InternalError,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1394 "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	1395 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1396 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1397 }
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1398 }
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1399 }
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1400
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1401 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	1402 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1403 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	1404
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1405 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	1406 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1407 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1408 "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	1409 "\" 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	1410 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1411 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1412 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1413 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	1414 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1415 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	1416 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1417 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	1418 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	1419 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	1420 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1421 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1422 "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	1423 "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	1424 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1425 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1426 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1427 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	1428 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	1429 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1430 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1431 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	1432 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1433 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	1434 !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	1435 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	1436 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	1437 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1438 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1439 "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	1440 "\"" + 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	1441 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	1442 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1443 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1444 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1445 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	1446 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	1447 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1448 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1449 else
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1450 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1451 throw OrthancException(ErrorCode_BadFileFormat,
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1452 "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	1453 "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	1454 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1455 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1456 }
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
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1459 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	1460 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1461 throw OrthancException(ErrorCode_InternalError);
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
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1464 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	1465
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1466 if (sopClassUids.empty())
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1467 {
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1468 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	1469 }
e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1470
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1471 {
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1472 const RemoteModalityParameters remote =
4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1473 MyGetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
3611 0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1474
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1475 const std::string& remoteAet = remote.GetApplicationEntityTitle();
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1476 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1477
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1478 // 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	1479 // 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	1480 context.GetStorageCommitmentReports().Store(
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1481 transactionUid, new StorageCommitmentReports::Report(remoteAet));
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1482
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	1483 DicomAssociationParameters parameters(localAet, remote);
447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3808 diff changeset	1484
3740 e69c556f1913 storage commitment SCU against a list of Orthanc IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 3738 diff changeset	1485 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	1486 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	1487 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	1488 }
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1489
3734 4fc24b69446a triggering storage commitment scu from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1490 Json::Value result = Json::objectValue;
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1491 result["ID"] = transactionUid;
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1492 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	1493 call.GetOutput().AnswerJson(result);
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1494 }
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1495 }
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1496
0ce9c1c6474f test route in REST API for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1497
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1498 static void GetStorageCommitmentReport(RestApiGetCall& call)
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1499 {
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1500 ServerContext& context = OrthancRestApi::GetContext(call);
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1501
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1502 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	1503
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1504 {
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1505 StorageCommitmentReports::Accessor accessor(
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1506 context.GetStorageCommitmentReports(), transactionUid);
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1507
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1508 if (accessor.IsValid())
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1509 {
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1510 Json::Value json;
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1511 accessor.GetReport().Format(json);
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1512 call.GetOutput().AnswerJson(json);
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1513 }
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1514 else
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1515 {
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1516 throw OrthancException(ErrorCode_InexistentItem,
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1517 "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	1518 }
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1519 }
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1520 }
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1521
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1522
3738 bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1523 static void RemoveAfterStorageCommitment(RestApiPostCall& call)
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1524 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1525 ServerContext& context = OrthancRestApi::GetContext(call);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1526
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1527 const std::string& transactionUid = call.GetUriComponent("id", "");
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1528
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1529 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1530 StorageCommitmentReports::Accessor accessor(
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1531 context.GetStorageCommitmentReports(), transactionUid);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1532
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1533 if (!accessor.IsValid())
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1534 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1535 throw OrthancException(ErrorCode_InexistentItem,
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1536 "No storage commitment transaction with UID: " + transactionUid);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1537 }
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1538 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	1539 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1540 throw OrthancException(ErrorCode_BadSequenceOfCalls,
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1541 "Cannot remove DICOM instances after failure "
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1542 "in storage commitment transaction: " + transactionUid);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1543 }
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1544 else
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1545 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1546 std::vector<std::string> sopInstanceUids;
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1547 accessor.GetReport().GetSuccessSopInstanceUids(sopInstanceUids);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1548
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1549 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	1550 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1551 std::vector<std::string> orthancId;
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1552 context.GetIndex().LookupIdentifierExact(
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1553 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	1554
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1555 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	1556 {
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1557 LOG(INFO) << "Storage commitment - Removing SOP instance UID / Orthanc ID: "
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1558 << sopInstanceUids[i] << " / " << orthancId[j];
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 Json::Value tmp;
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1561 context.GetIndex().DeleteResource(tmp, orthancId[j], ResourceType_Instance);
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 }
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1564
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1565 call.GetOutput().AnswerBuffer("{}", MimeType_Json);
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1566 }
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 }
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1569
bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1570
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1571 void OrthancRestApi::RegisterModalities()
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1572 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1573 Register("/modalities", ListModalities);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1574 Register("/modalities/{id}", ListModalityOperations);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1575 Register("/modalities/{id}", UpdateModality);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	1576 Register("/modalities/{id}", DeleteModality);
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	1577 Register("/modalities/{id}/echo", DicomEcho);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1578 Register("/modalities/{id}/find-patient", DicomFindPatient);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1579 Register("/modalities/{id}/find-study", DicomFindStudy);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1580 Register("/modalities/{id}/find-series", DicomFindSeries);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1581 Register("/modalities/{id}/find-instance", DicomFindInstance);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1582 Register("/modalities/{id}/find", DicomFind);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1583 Register("/modalities/{id}/store", DicomStore);
3808 7f083dfae62b new REST route: /modalities/{id}/store-straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 3740 diff changeset	1584 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	1585 Register("/modalities/{id}/move", DicomMove);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1586
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1587 // For Query/Retrieve
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1588 Register("/modalities/{id}/query", DicomQuery);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1589 Register("/queries", ListQueries);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1590 Register("/queries/{id}", DeleteQuery);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1591 Register("/queries/{id}", ListQueryOperations);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1592 Register("/queries/{id}/answers", ListQueryAnswers);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1593 Register("/queries/{id}/answers/{index}", ListQueryAnswerOperations);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1594 Register("/queries/{id}/answers/{index}/content", GetQueryOneAnswer);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1595 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	1596 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	1597 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	1598 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	1599 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	1600 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	1601 QueryAnswerChildren<ResourceType_Study>);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1602 Register("/queries/{id}/level", GetQueryLevel);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1603 Register("/queries/{id}/modality", GetQueryModality);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1604 Register("/queries/{id}/query", GetQueryArguments);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1605 Register("/queries/{id}/retrieve", RetrieveAllAnswers);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1606
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1607 Register("/peers", ListPeers);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1608 Register("/peers/{id}", ListPeerOperations);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1609 Register("/peers/{id}", UpdatePeer);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	1610 Register("/peers/{id}", DeletePeer);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1611 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	1612 Register("/peers/{id}/system", PeerSystem);
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1613
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	1614 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	1615
3738 bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1616 // Storage commitment
3737 f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1617 Register("/modalities/{id}/storage-commitment", StorageCommitmentScu);
f29843323daf accessing storage commitment reports from REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	1618 Register("/storage-commitment/{id}", GetStorageCommitmentReport);
3738 bff4da769f6f new route: "/storage-commitment/{...}/remove" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3737 diff changeset	1619 Register("/storage-commitment/{id}/remove", RemoveAfterStorageCommitment);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1620 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1621 }

Mercurial > hg > orthanc

annotate OrthancServer/OrthancRestApi/OrthancRestModalities.cpp @ 3830:447880856ce8