orthanc: OrthancServer/OrthancRestApi/OrthancRestModalities.cpp annotate

annotate OrthancServer/OrthancRestApi/OrthancRestModalities.cpp @ 2105:d1bb4bbe9775

note

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 17 Oct 2016 12:17:22 +0200
parents	f8d4543e3fef
children	21713ce8717b

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
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * This program is free software: you can redistribute it and/or
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * modify it under the terms of the GNU General Public License as
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * published by the Free Software Foundation, either version 3 of the
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * License, or (at your option) any later version.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * In addition, as a special exception, the copyright holders of this
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * program give permission to link the code of its release with the
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * that use the same license as the "OpenSSL" library), and distribute
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * the linked executables. You must obey the GNU General Public License
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * in all respects for all of the code used other than "OpenSSL". If you
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * modify file(s) with this exception, you may extend this exception to
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * your version of the file(s), but you are not obligated to do so. If
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * you do not wish to do so, delete this exception statement from your
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * version. If you delete this exception statement from all source files
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * in the program, then also delete it here.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * This program is distributed in the hope that it will be useful, but
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * You should have received a copy of the GNU General Public License
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 **/
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	33 #include "../PrecompiledHeadersServer.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "OrthancRestApi.h"
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #include "../OrthancInitialization.h"
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #include "../../Core/HttpClient.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1446 diff changeset	38 #include "../../Core/Logging.h"
795 d466b3606aca refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	39 #include "../FromDcmtkBridge.h"
999 db18c071fbd7 store-scu filter Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	40 #include "../Scheduler/ServerJob.h"
1000 13e230bbd882 rename filter to command Sebastien Jodogne <s.jodogne@gmail.com> parents: 999 diff changeset	41 #include "../Scheduler/StoreScuCommand.h"
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1000 diff changeset	42 #include "../Scheduler/StorePeerCommand.h"
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	43 #include "../QueryRetrieveHandler.h"
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	44 #include "../ServerToolbox.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 namespace Orthanc
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	48 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	49 * DICOM C-Echo SCU
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	50 ***************************************************************************/
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	51
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	52 static void DicomEcho(RestApiPostCall& call)
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	53 {
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	54 ServerContext& context = OrthancRestApi::GetContext(call);
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	55
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	56 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	57 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
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	58 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), localAet, remote);
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	59
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	60 try
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	61 {
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	62 if (locker.GetConnection().Echo())
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	63 {
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	64 // Echo has succeeded
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	65 call.GetOutput().AnswerBuffer("{}", "application/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	66 return;
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	67 }
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	68 }
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	69 catch (OrthancException&)
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	70 {
bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	71 }
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	72
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	73 // 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	74 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	75 }
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
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	78
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	79 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	80 * DICOM C-Find SCU => DEPRECATED!
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	81 ***************************************************************************/
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	82
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	83 static bool MergeQueryAndTemplate(DicomMap& result,
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	84 const char* postData,
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	85 size_t postSize)
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	86 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	87 Json::Value query;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	88 Json::Reader reader;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	89
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	90 if (!reader.parse(postData, postData + postSize, query) \|\|
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	91 query.type() != Json::objectValue)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	92 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	93 return false;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	94 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	95
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	96 Json::Value::Members members = query.getMemberNames();
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	97 for (size_t i = 0; i < members.size(); i++)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	98 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	99 DicomTag t = FromDcmtkBridge::ParseTag(members[i]);
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	100 result.SetValue(t, query[members[i]].asString(), false);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	101 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	102
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	103 return true;
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
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 static void FindPatient(DicomFindAnswers& result,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	108 DicomUserConnection& connection,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	109 const DicomMap& fields)
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 // 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	112 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	113 fields.ExtractPatientInformation(s);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	114 connection.Find(result, ResourceType_Patient, s);
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
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 static void FindStudy(DicomFindAnswers& result,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	119 DicomUserConnection& connection,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	120 const DicomMap& fields)
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 // 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	123 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	124 fields.ExtractStudyInformation(s);
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 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	127 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	128 s.CopyTagIfExists(fields, DICOM_TAG_MODALITIES_IN_STUDY);
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 connection.Find(result, ResourceType_Study, s);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	131 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	132
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	133 static void FindSeries(DicomFindAnswers& result,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	134 DicomUserConnection& connection,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	135 const DicomMap& fields)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	136 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	137 // 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	138 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	139 fields.ExtractSeriesInformation(s);
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 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	142 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	143 s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID);
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 connection.Find(result, ResourceType_Series, s);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	146 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	147
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	148 static void FindInstance(DicomFindAnswers& result,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	149 DicomUserConnection& connection,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	150 const DicomMap& fields)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	151 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	152 // 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	153 DicomMap s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	154 fields.ExtractInstanceInformation(s);
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 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	157 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	158 s.CopyTagIfExists(fields, DICOM_TAG_STUDY_INSTANCE_UID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	159 s.CopyTagIfExists(fields, DICOM_TAG_SERIES_INSTANCE_UID);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	160
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	161 connection.Find(result, ResourceType_Instance, s);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	162 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	163
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	164
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	165 static void DicomFindPatient(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	167 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	168 ServerContext& context = OrthancRestApi::GetContext(call);
3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	169
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	170 DicomMap fields;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	171 DicomMap::SetupFindPatientTemplate(fields);
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	172 if (!MergeQueryAndTemplate(fields, call.GetBodyData(), call.GetBodySize()))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176
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	177 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	178 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
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	179 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), localAet, remote);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	181 DicomFindAnswers answers(false);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	182 FindPatient(answers, locker.GetConnection(), fields);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184 Json::Value result;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	185 answers.ToJson(result, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	187 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	189 static void DicomFindStudy(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	190 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	191 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	192 ServerContext& context = OrthancRestApi::GetContext(call);
3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	193
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	194 DicomMap fields;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	195 DicomMap::SetupFindStudyTemplate(fields);
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	196 if (!MergeQueryAndTemplate(fields, call.GetBodyData(), call.GetBodySize()))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	201 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	202 fields.GetValue(DICOM_TAG_PATIENT_ID).GetContent().size() <= 2)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206
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	207 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	208 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
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	209 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), localAet, remote);
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	210
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	211 DicomFindAnswers answers(false);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	212 FindStudy(answers, locker.GetConnection(), fields);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 Json::Value result;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	215 answers.ToJson(result, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	219 static void DicomFindSeries(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	221 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	222 ServerContext& context = OrthancRestApi::GetContext(call);
3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	223
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	224 DicomMap fields;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	225 DicomMap::SetupFindSeriesTemplate(fields);
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	226 if (!MergeQueryAndTemplate(fields, call.GetBodyData(), call.GetBodySize()))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	231 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	232 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	233 fields.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent().size() <= 2)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237
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	238 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	239 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
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	240 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), localAet, remote);
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	241
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	242 DicomFindAnswers answers(false);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	243 FindSeries(answers, locker.GetConnection(), fields);
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 DicomFindInstance(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::SetupFindInstanceTemplate(fields);
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	257 if (!MergeQueryAndTemplate(fields, call.GetBodyData(), call.GetBodySize()))
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 \|\|
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	265 fields.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).GetContent().size() <= 2)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269
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	270 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	271 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
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	272 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), localAet, remote);
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	273
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	274 DicomFindAnswers answers(false);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	275 FindInstance(answers, locker.GetConnection(), fields);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 Json::Value result;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	278 answers.ToJson(result, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	282
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	283 static void CopyTagIfExists(DicomMap& target,
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	284 ParsedDicomFile& source,
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	285 const DicomTag& tag)
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	286 {
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	287 std::string tmp;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	288 if (source.GetTagValue(tmp, tag))
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	289 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1998 diff changeset	290 target.SetValue(tag, tmp, false);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	291 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	292 }
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	293
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	294
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	295 static void DicomFind(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	297 LOG(WARNING) << "This URI is deprecated: " << call.FlattenUri();
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	298 ServerContext& context = OrthancRestApi::GetContext(call);
3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	299
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 DicomMap m;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 DicomMap::SetupFindPatientTemplate(m);
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	302 if (!MergeQueryAndTemplate(m, call.GetBodyData(), call.GetBodySize()))
751 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 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306
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	307 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	308 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
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	309 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), localAet, remote);
773 3bd0589af992 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	310
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	311 DicomFindAnswers patients(false);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	312 FindPatient(patients, locker.GetConnection(), m);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 // Loop over the found patients
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 Json::Value result = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316 for (size_t i = 0; i < patients.GetSize(); i++)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	318 Json::Value patient;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	319 patients.ToJson(patient, i, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321 DicomMap::SetupFindStudyTemplate(m);
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	322 if (!MergeQueryAndTemplate(m, call.GetBodyData(), call.GetBodySize()))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 }
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	326
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	327 CopyTagIfExists(m, patients.GetAnswer(i), DICOM_TAG_PATIENT_ID);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	329 DicomFindAnswers studies(false);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	330 FindStudy(studies, locker.GetConnection(), m);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 patient["Studies"] = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 // Loop over the found studies
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 for (size_t j = 0; j < studies.GetSize(); j++)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	337 Json::Value study;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	338 studies.ToJson(study, j, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340 DicomMap::SetupFindSeriesTemplate(m);
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	341 if (!MergeQueryAndTemplate(m, call.GetBodyData(), call.GetBodySize()))
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 }
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	345
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	346 CopyTagIfExists(m, studies.GetAnswer(j), DICOM_TAG_PATIENT_ID);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	347 CopyTagIfExists(m, studies.GetAnswer(j), DICOM_TAG_STUDY_INSTANCE_UID);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	349 DicomFindAnswers series(false);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	350 FindSeries(series, locker.GetConnection(), m);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 // Loop over the found series
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 study["Series"] = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 for (size_t k = 0; k < series.GetSize(); k++)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 {
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	356 Json::Value series2;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	357 series.ToJson(series2, k, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 study["Series"].append(series2);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 patient["Studies"].append(study);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 result.append(patient);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	371
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	372 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	373 * 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	374 ***************************************************************************/
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	375
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	376 static void DicomQuery(RestApiPostCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	377 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	378 ServerContext& context = OrthancRestApi::GetContext(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	379 Json::Value request;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	380
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	381 if (call.ParseJsonRequest(request) &&
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	382 request.type() == Json::objectValue &&
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	383 request.isMember("Level") && request["Level"].type() == Json::stringValue &&
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	384 (!request.isMember("Query") \|\| request["Query"].type() == Json::objectValue))
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	385 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	386 std::auto_ptr<QueryRetrieveHandler> handler(new QueryRetrieveHandler(context));
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	387
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	388 handler->SetModality(call.GetUriComponent("id", ""));
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	389 handler->SetLevel(StringToResourceType(request["Level"].asCString()));
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	390
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	391 if (request.isMember("Query"))
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	392 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	393 Json::Value::Members tags = request["Query"].getMemberNames();
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	394 for (size_t i = 0; i < tags.size(); i++)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	395 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	396 handler->SetQuery(FromDcmtkBridge::ParseTag(tags[i].c_str()),
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	397 request["Query"][tags[i]].asString());
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	398 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	399 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	400
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	401 handler->Run();
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	402
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	403 std::string s = context.GetQueryRetrieveArchive().Add(handler.release());
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	404 Json::Value result = Json::objectValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	405 result["ID"] = s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	406 result["Path"] = "/queries/" + s;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	407 call.GetOutput().AnswerJson(result);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	408 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	409 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	410
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	411
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	412 static void ListQueries(RestApiGetCall& call)
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 ServerContext& context = OrthancRestApi::GetContext(call);
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 std::list<std::string> queries;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	417 context.GetQueryRetrieveArchive().List(queries);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	418
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	419 Json::Value result = Json::arrayValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	420 for (std::list<std::string>::const_iterator
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	421 it = queries.begin(); it != queries.end(); ++it)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	422 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	423 result.append(*it);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	424 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	425
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	426 call.GetOutput().AnswerJson(result);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	427 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	428
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	429
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	430 namespace
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	431 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	432 class QueryAccessor
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	433 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	434 private:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	435 ServerContext& context_;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	436 SharedArchive::Accessor accessor_;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	437 QueryRetrieveHandler& handler_;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	438
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	439 public:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	440 QueryAccessor(RestApiCall& call) :
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	441 context_(OrthancRestApi::GetContext(call)),
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	442 accessor_(context_.GetQueryRetrieveArchive(), call.GetUriComponent("id", "")),
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	443 handler_(dynamic_cast<QueryRetrieveHandler&>(accessor_.GetItem()))
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	444 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	445 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	446
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	447 QueryRetrieveHandler* operator->()
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	448 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	449 return &handler_;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	450 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	451 };
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	452
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	453 static void AnswerDicomMap(RestApiCall& call,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	454 const DicomMap& value,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	455 bool simplify)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	456 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	457 Json::Value full = Json::objectValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	458 FromDcmtkBridge::ToJson(full, value, simplify);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	459 call.GetOutput().AnswerJson(full);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	460 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	461 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	462
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	463
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	464 static void ListQueryAnswers(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	465 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	466 QueryAccessor query(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	467 size_t count = query->GetAnswerCount();
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	468
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	469 Json::Value result = Json::arrayValue;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	470 for (size_t i = 0; i < count; i++)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	471 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	472 result.append(boost::lexical_cast<std::string>(i));
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	473 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	474
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	475 call.GetOutput().AnswerJson(result);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	476 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	477
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	478
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	479 static void GetQueryOneAnswer(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	480 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	481 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	482
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	483 QueryAccessor query(call);
1787 1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	484
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	485 DicomMap map;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	486 query->GetAnswer(map, index);
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	487
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	488 AnswerDicomMap(call, map, call.HasArgument("simplify"));
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	489 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	490
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 static void RetrieveOneAnswer(RestApiPostCall& call)
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 size_t index = boost::lexical_cast<size_t>(call.GetUriComponent("index", ""));
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	495
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	496 std::string modality;
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	497 call.BodyToString(modality);
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	498
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	499 LOG(WARNING) << "Driving C-Move SCU on modality: " << modality;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	500
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	501 QueryAccessor query(call);
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	502 query->Retrieve(modality, index);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	503
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	504 // Retrieve has succeeded
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	505 call.GetOutput().AnswerBuffer("{}", "application/json");
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	506 }
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 static void RetrieveAllAnswers(RestApiPostCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	510 {
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	511 std::string modality;
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	512 call.BodyToString(modality);
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	513
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	514 LOG(WARNING) << "Driving C-Move SCU on modality: " << modality;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	515
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	516 QueryAccessor query(call);
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	517 query->Retrieve(modality);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	518
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	519 // Retrieve has succeeded
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	520 call.GetOutput().AnswerBuffer("{}", "application/json");
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
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	523
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	524 static void GetQueryArguments(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	525 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	526 QueryAccessor query(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	527 AnswerDicomMap(call, query->GetQuery(), call.HasArgument("simplify"));
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	528 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	529
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	530
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	531 static void GetQueryLevel(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	532 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	533 QueryAccessor query(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	534 call.GetOutput().AnswerBuffer(EnumerationToString(query->GetLevel()), "text/plain");
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	535 }
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
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	538 static void GetQueryModality(RestApiGetCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	539 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	540 QueryAccessor query(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	541 call.GetOutput().AnswerBuffer(query->GetModalitySymbolicName(), "text/plain");
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 DeleteQuery(RestApiDeleteCall& call)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	546 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	547 ServerContext& context = OrthancRestApi::GetContext(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	548 context.GetQueryRetrieveArchive().Remove(call.GetUriComponent("id", ""));
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	549 call.GetOutput().AnswerBuffer("", "text/plain");
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	550 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	551
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 static void ListQueryOperations(RestApiGetCall& call)
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 // Ensure that the query of interest does exist
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	556 QueryAccessor query(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	557
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	558 RestApi::AutoListChildren(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	559 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	560
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	561
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	562 static void ListQueryAnswerOperations(RestApiGetCall& call)
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 // Ensure that the query of interest does exist
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	565 QueryAccessor query(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	566
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	567 // Ensure that the answer of interest does exist
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	568 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	569
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	570 DicomMap map;
1b1d5470233f refactoring of DicomFindAnswers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	571 query->GetAnswer(map, index);
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	572
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	573 RestApi::AutoListChildren(call);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	574 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	575
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	576
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	577
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	578
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	579 /***************************************************************************
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	580 * DICOM C-Store SCU
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	581 ***************************************************************************/
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	582
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	583 static bool GetInstancesToExport(Json::Value& otherArguments,
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	584 std::list<std::string>& instances,
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	585 const std::string& remote,
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	586 RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	588 otherArguments = Json::objectValue;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	591 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	592 if (Toolbox::IsSHA1(call.GetBodyData(), call.GetBodySize()))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 {
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	594 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	595 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	596
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597 // This is for compatibility with Orthanc <= 0.5.1.
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	598 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	599 request.append(Toolbox::StripSpaces(s));
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	600 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601 else if (!call.ParseJsonRequest(request))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	602 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 // Bad JSON request
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604 return false;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	605 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	606
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607 if (request.isString())
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	608 {
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	609 std::string item = request.asString();
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	610 request = Json::arrayValue;
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	611 request.append(item);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	613
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	614 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	615 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	616 {
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	617 resources = &request;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	618 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619 else
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620 {
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	621 if (request.type() != Json::objectValue \|\|
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	622 !request.isMember("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	623 {
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	624 return false;
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	625 }
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	626
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	627 resources = &request["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	628 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	629 {
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	630 return false;
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	631 }
1428 0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	632
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	633 // Copy the remaining arguments
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	634 Json::Value::Members members = request.getMemberNames();
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	635 for (Json::Value::ArrayIndex i = 0; i < members.size(); i++)
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	636 {
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	637 otherArguments[members[i]] = request[members[i]];
0a355eeeb351 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	638 }
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	639 }
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	640
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	641 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	642 {
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	643 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	644 {
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	645 return false;
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	646 }
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	647
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	648 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	649 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	650 {
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	651 return false;
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	652 }
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	653
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	654 if (Configuration::GetGlobalBoolParameter("LogExportedResources", true))
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	655 {
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	656 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	657 }
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	658
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	659 std::list<std::string> tmp;
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	660 context.GetIndex().GetChildInstances(tmp, 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	661
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	662 for (std::list<std::string>::const_iterator
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	663 it = tmp.begin(); it != tmp.end(); ++it)
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	664 {
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	665 instances.push_back(*it);
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	666 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	667 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	668
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	669 return true;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	670 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	671
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	672
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	673 static void DicomStore(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	674 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	675 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	676
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677 std::string remote = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	678
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	679 Json::Value request;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	680 std::list<std::string> instances;
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	681 if (!GetInstancesToExport(request, instances, remote, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	682 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	683 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685
2071 27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2067 diff changeset	686 std::string localAet = Toolbox::GetJsonStringField(request, "LocalAet", context.GetDefaultLocalApplicationEntityTitle());
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2067 diff changeset	687 bool permissive = Toolbox::GetJsonBooleanField(request, "Permissive", false);
2072 f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	688 bool asynchronous = Toolbox::GetJsonBooleanField(request, "Asynchronous", false);
2071 27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2067 diff changeset	689 int moveOriginatorID = Toolbox::GetJsonIntegerField(request, "MoveOriginatorID", 0 /* By default, not a C-MOVE */);
1997 f9f2aa1cc594 "MoveOriginatorID" can be specified for /modalities/.../store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1907 diff changeset	690
2071 27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2067 diff changeset	691 if (moveOriginatorID < 0 \|\|
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2067 diff changeset	692 moveOriginatorID >= 65536)
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2067 diff changeset	693 {
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2067 diff changeset	694 throw OrthancException(ErrorCode_ParameterOutOfRange);
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	695 }
2071 27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2067 diff changeset	696
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	697 RemoteModalityParameters p = Configuration::GetModalityUsingSymbolicName(remote);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	698
999 db18c071fbd7 store-scu filter Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	699 ServerJob job;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	700 for (std::list<std::string>::const_iterator
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	701 it = instances.begin(); it != instances.end(); ++it)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	702 {
2067 02c543c42e61 "Permissive" flag for URI "/modalities/{...}/store" to ignore C-Store transfer errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 2059 diff changeset	703 job.AddCommand(new StoreScuCommand(context, localAet, p, permissive,
2071 27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2067 diff changeset	704 static_cast<uint16_t>(moveOriginatorID))).AddInput(*it);
999 db18c071fbd7 store-scu filter Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	705 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	706
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1000 diff changeset	707 job.SetDescription("HTTP request: Store-SCU to peer \"" + remote + "\"");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	708
2072 f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	709 if (asynchronous)
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	710 {
2072 f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	711 // Asynchronous mode: Submit the job, but don't wait for its completion
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	712 context.GetScheduler().Submit(job);
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	713 call.GetOutput().AnswerBuffer("{}", "application/json");
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	714 }
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	715 else if (context.GetScheduler().SubmitAndWait(job))
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	716 {
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	717 // Synchronous mode: We have submitted and waited for completion
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	718 call.GetOutput().AnswerBuffer("{}", "application/json");
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	719 }
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	720 else
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	721 {
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	722 call.GetOutput().SignalError(HttpStatus_500_InternalServerError);
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	723 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	724 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	725
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	726
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	727 /***************************************************************************
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	728 * 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	729 ***************************************************************************/
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	730
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	731 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	732 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	733 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	734
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	735 Json::Value request;
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	736
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	737 static const char* RESOURCES = "Resources";
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	738 static const char* LEVEL = "Level";
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	739
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	740 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	741 request.type() != Json::objectValue \|\|
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	742 !request.isMember(RESOURCES) \|\|
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	743 !request.isMember(LEVEL) \|\|
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	744 request[RESOURCES].type() != Json::arrayValue \|\|
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	745 request[LEVEL].type() != Json::stringValue)
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	746 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	747 throw OrthancException(ErrorCode_BadFileFormat);
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	748 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	749
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	750 ResourceType level = StringToResourceType(request["Level"].asCString());
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	751
2071 27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2067 diff changeset	752 std::string localAet = Toolbox::GetJsonStringField(request, "LocalAet", context.GetDefaultLocalApplicationEntityTitle());
27fd34970c52 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2067 diff changeset	753 std::string targetAet = Toolbox::GetJsonStringField(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	754
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	755 const RemoteModalityParameters source = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	756
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	757 for (Json::Value::ArrayIndex i = 0; i < request[RESOURCES].size(); i++)
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	758 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	759 DicomMap resource;
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	760 FromDcmtkBridge::FromJson(resource, request[RESOURCES][i]);
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	761
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	762 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), localAet, source);
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	763 locker.GetConnection().Move(targetAet, level, resource);
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	764 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	765
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	766 // Move has succeeded
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	767 call.GetOutput().AnswerBuffer("{}", "application/json");
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	768 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	769
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	770
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	771
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	772 /***************************************************************************
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	773 * Orthanc Peers => Store client
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	774 ***************************************************************************/
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	775
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	776 static bool IsExistingPeer(const OrthancRestApi::SetOfStrings& peers,
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	777 const std::string& id)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	778 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	779 return peers.find(id) != peers.end();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	780 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	781
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	782 static void ListPeers(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	783 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	784 OrthancRestApi::SetOfStrings peers;
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	785 Configuration::GetListOfOrthancPeers(peers);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	786
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	787 Json::Value result = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	788 for (OrthancRestApi::SetOfStrings::const_iterator
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	789 it = peers.begin(); it != peers.end(); ++it)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	790 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	791 result.append(*it);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	792 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	793
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	794 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	795 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	796
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	797 static void ListPeerOperations(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	798 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	799 OrthancRestApi::SetOfStrings peers;
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	800 Configuration::GetListOfOrthancPeers(peers);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	801
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	802 std::string id = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	803 if (IsExistingPeer(peers, id))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804 {
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	805 RestApi::AutoListChildren(call);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	806 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	807 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	808
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	809 static void PeerStore(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	810 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	811 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	812
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	813 std::string remote = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	814
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	815 Json::Value request;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	816 std::list<std::string> instances;
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	817 if (!GetInstancesToExport(request, instances, remote, call))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	818 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	819 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	820 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	821
2072 f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	822 bool asynchronous = Toolbox::GetJsonBooleanField(request, "Asynchronous", false);
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	823
2020 a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	824 WebServiceParameters peer;
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	825 Configuration::GetOrthancPeer(peer, remote);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	826
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1000 diff changeset	827 ServerJob job;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	828 for (std::list<std::string>::const_iterator
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	829 it = instances.begin(); it != instances.end(); ++it)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830 {
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	831 job.AddCommand(new StorePeerCommand(context, peer, false)).AddInput(*it);
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1000 diff changeset	832 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833
1007 871c49c9b11d lua routing is working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1000 diff changeset	834 job.SetDescription("HTTP request: POST to peer \"" + remote + "\"");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835
2072 f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	836 if (asynchronous)
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	837 {
2072 f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	838 // Asynchronous mode: Submit the job, but don't wait for its completion
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	839 context.GetScheduler().Submit(job);
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	840 call.GetOutput().AnswerBuffer("{}", "application/json");
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	841 }
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	842 else if (context.GetScheduler().SubmitAndWait(job))
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	843 {
f8d4543e3fef Asynchronous flags to avoid waiting for the completion of image transfers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2071 diff changeset	844 // Synchronous mode: We have submitted and waited for completion
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	845 call.GetOutput().AnswerBuffer("{}", "application/json");
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	846 }
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	847 else
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	848 {
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	849 call.GetOutput().SignalError(HttpStatus_500_InternalServerError);
0561f2087cc9 Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 1142 diff changeset	850 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	851 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	852
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	853
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	854 // DICOM bridge -------------------------------------------------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	855
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	856 static bool IsExistingModality(const OrthancRestApi::SetOfStrings& modalities,
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857 const std::string& id)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	858 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	859 return modalities.find(id) != modalities.end();
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	860 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	861
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	862 static void ListModalities(RestApiGetCall& call)
751 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 OrthancRestApi::SetOfStrings modalities;
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	865 Configuration::GetListOfDicomModalities(modalities);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	866
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867 Json::Value result = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	868 for (OrthancRestApi::SetOfStrings::const_iterator
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	869 it = modalities.begin(); it != modalities.end(); ++it)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	870 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	871 result.append(*it);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	872 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	873
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	874 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	875 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	877
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	878 static void ListModalityOperations(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	879 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	880 OrthancRestApi::SetOfStrings modalities;
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	881 Configuration::GetListOfDicomModalities(modalities);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	882
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	883 std::string id = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	884 if (IsExistingModality(modalities, id))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	885 {
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	886 RestApi::AutoListChildren(call);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	887 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	888 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	889
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	890
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	891 static void UpdateModality(RestApiPutCall& call)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	892 {
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	893 Json::Value json;
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	894 Json::Reader reader;
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	895 if (reader.parse(call.GetBodyData(), call.GetBodyData() + call.GetBodySize(), json))
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	896 {
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	897 RemoteModalityParameters modality;
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	898 modality.FromJson(json);
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	899 Configuration::UpdateModality(call.GetUriComponent("id", ""), modality);
813 b640aeee11ba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 812 diff changeset	900 call.GetOutput().AnswerBuffer("", "text/plain");
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	901 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	902 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	903
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	904
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	905 static void DeleteModality(RestApiDeleteCall& call)
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	906 {
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	907 Configuration::RemoveModality(call.GetUriComponent("id", ""));
813 b640aeee11ba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 812 diff changeset	908 call.GetOutput().AnswerBuffer("", "text/plain");
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	909 }
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	910
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	911
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	912 static void UpdatePeer(RestApiPutCall& call)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	913 {
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	914 Json::Value json;
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	915 Json::Reader reader;
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	916 if (reader.parse(call.GetBodyData(), call.GetBodyData() + call.GetBodySize(), json))
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	917 {
2020 a0bd8cd55da7 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	918 WebServiceParameters peer;
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	919 peer.FromJson(json);
812 8a36c947490c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	920 Configuration::UpdatePeer(call.GetUriComponent("id", ""), peer);
813 b640aeee11ba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 812 diff changeset	921 call.GetOutput().AnswerBuffer("", "text/plain");
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	922 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	923 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	924
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	925
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	926 static void DeletePeer(RestApiDeleteCall& call)
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	927 {
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 808 diff changeset	928 Configuration::RemovePeer(call.GetUriComponent("id", ""));
813 b640aeee11ba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 812 diff changeset	929 call.GetOutput().AnswerBuffer("", "text/plain");
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	930 }
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	931
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	932
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	933 static void DicomFindWorklist(RestApiPostCall& call)
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	934 {
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	935 ServerContext& context = OrthancRestApi::GetContext(call);
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	936
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	937 Json::Value json;
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	938 if (call.ParseJsonRequest(json))
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	939 {
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	940 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle();
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	941 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	942
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	943 std::auto_ptr<ParsedDicomFile> query(ParsedDicomFile::CreateFromJson(json, static_cast<DicomFromJsonFlags>(0)));
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	944
2059 8e67325eaa3f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	945 DicomFindAnswers answers(true);
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	946
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	947 {
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	948 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), localAet, remote);
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	949 locker.GetConnection().FindWorklist(answers, *query);
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	950 }
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	951
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	952 Json::Value result;
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	953 answers.ToJson(result, true);
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	954 call.GetOutput().AnswerJson(result);
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	955 }
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	956 }
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	957
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	958
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	959 void OrthancRestApi::RegisterModalities()
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	960 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	961 Register("/modalities", ListModalities);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	962 Register("/modalities/{id}", ListModalityOperations);
807 566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	963 Register("/modalities/{id}", UpdateModality);
566a2fb3c1fb update/delete modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	964 Register("/modalities/{id}", DeleteModality);
1049 bd2cb95003da C-Echo SCU in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1007 diff changeset	965 Register("/modalities/{id}/echo", DicomEcho);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	966 Register("/modalities/{id}/find-patient", DicomFindPatient);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	967 Register("/modalities/{id}/find-study", DicomFindStudy);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	968 Register("/modalities/{id}/find-series", DicomFindSeries);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969 Register("/modalities/{id}/find-instance", DicomFindInstance);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	970 Register("/modalities/{id}/find", DicomFind);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	971 Register("/modalities/{id}/store", DicomStore);
1998 9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1997 diff changeset	972 Register("/modalities/{id}/move", DicomMove);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	973
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	974 // For Query/Retrieve
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	975 Register("/modalities/{id}/query", DicomQuery);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	976 Register("/queries", ListQueries);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	977 Register("/queries/{id}", DeleteQuery);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	978 Register("/queries/{id}", ListQueryOperations);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	979 Register("/queries/{id}/answers", ListQueryAnswers);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	980 Register("/queries/{id}/answers/{index}", ListQueryAnswerOperations);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	981 Register("/queries/{id}/answers/{index}/content", GetQueryOneAnswer);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	982 Register("/queries/{id}/answers/{index}/retrieve", RetrieveOneAnswer);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	983 Register("/queries/{id}/level", GetQueryLevel);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	984 Register("/queries/{id}/modality", GetQueryModality);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	985 Register("/queries/{id}/query", GetQueryArguments);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	986 Register("/queries/{id}/retrieve", RetrieveAllAnswers);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	987
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	988 Register("/peers", ListPeers);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	989 Register("/peers/{id}", ListPeerOperations);
808 2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	990 Register("/peers/{id}", UpdatePeer);
2d9a000aa3a6 update/delete peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 807 diff changeset	991 Register("/peers/{id}", DeletePeer);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	992 Register("/peers/{id}/store", PeerStore);
1819 84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	993
84f0a118a72c new URI: /modalities/{id}/find-worklist Sebastien Jodogne <s.jodogne@gmail.com> parents: 1787 diff changeset	994 Register("/modalities/{id}/find-worklist", DicomFindWorklist);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	995 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	996 }

Mercurial > hg > orthanc

annotate OrthancServer/OrthancRestApi/OrthancRestModalities.cpp @ 2105:d1bb4bbe9775