orthanc: OrthancServer/OrthancRestApi2.cpp annotate

annotate OrthancServer/OrthancRestApi2.cpp @ 227:209ca3f6db62

dicom-scu from rest

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 30 Nov 2012 10:57:34 +0100
parents	8a26a8e85edf
children

rev	line source
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012 Medical Physics Department, CHU of Liege,
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Belgium
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * This program is free software: you can redistribute it and/or
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * modify it under the terms of the GNU General Public License as
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * published by the Free Software Foundation, either version 3 of the
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * License, or (at your option) any later version.
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 *
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * In addition, as a special exception, the copyright holders of this
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * program give permission to link the code of its release with the
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * that use the same license as the "OpenSSL" library), and distribute
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * the linked executables. You must obey the GNU General Public License
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * in all respects for all of the code used other than "OpenSSL". If you
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * modify file(s) with this exception, you may extend this exception to
96b7918a6a18 start of the refactoring of the Orthanc REST API 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
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * you do not wish to do so, delete this exception statement from your
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * version. If you delete this exception statement from all source files
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * in the program, then also delete it here.
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * This program is distributed in the hope that it will be useful, but
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * You should have received a copy of the GNU General Public License
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 **/
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33 #include "OrthancRestApi2.h"
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	35 #include "../Core/HttpServer/FilesystemHttpSender.h"
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	36 #include "../Core/Uuid.h"
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	37 #include "DicomProtocol/DicomUserConnection.h"
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 #include "FromDcmtkBridge.h"
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	39 #include "OrthancInitialization.h"
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	40 #include "ServerToolbox.h"
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 #include <dcmtk/dcmdata/dcistrmb.h>
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 #include <dcmtk/dcmdata/dcfilefo.h>
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 #include <boost/lexical_cast.hpp>
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	45 #include <glog/logging.h>
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	48 #define RETRIEVE_CONTEXT(call) \
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	49 OrthancRestApi2& contextApi = \
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	50 dynamic_cast<OrthancRestApi2&>(call.GetContext()); \
225 03aa59ecf6d8 fix for mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	51 ServerContext& context = contextApi.GetContext()
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	53 #define RETRIEVE_MODALITIES(call) \
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	54 const OrthancRestApi2::Modalities& modalities = \
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	55 dynamic_cast<OrthancRestApi2&>(call.GetContext()).GetModalities();
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	56
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	57
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 namespace Orthanc
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 {
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	61 // DICOM SCU ----------------------------------------------------------------
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	62
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	63 static void ConnectToModality(DicomUserConnection& connection,
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	64 const std::string& name)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	65 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	66 std::string aet, address;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	67 int port;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	68 GetDicomModality(name, aet, address, port);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	69 connection.SetLocalApplicationEntityTitle(GetGlobalStringParameter("DicomAet", "ORTHANC"));
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	70 connection.SetDistantApplicationEntityTitle(aet);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	71 connection.SetDistantHost(address);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	72 connection.SetDistantPort(port);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	73 connection.Open();
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	74 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	75
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	76 static bool MergeQueryAndTemplate(DicomMap& result,
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	77 const std::string& postData)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	78 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	79 Json::Value query;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	80 Json::Reader reader;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	81
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	82 if (!reader.parse(postData, query) \|\|
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	83 query.type() != Json::objectValue)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	84 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	85 return false;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	86 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	87
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	88 Json::Value::Members members = query.getMemberNames();
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	89 for (size_t i = 0; i < members.size(); i++)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	90 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	91 DicomTag t = FromDcmtkBridge::FindTag(members[i]);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	92 result.SetValue(t, query[members[i]].asString());
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	93 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	94
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	95 return true;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	96 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	97
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	98 static void DicomFindPatient(RestApi::PostCall& call)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	99 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	100 DicomMap m;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	101 DicomMap::SetupFindPatientTemplate(m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	102 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	103 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	104 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	105 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	106
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	107 DicomUserConnection connection;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	108 ConnectToModality(connection, call.GetUriComponent("id", ""));
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	109
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	110 DicomFindAnswers answers;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	111 connection.FindPatient(answers, m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	112
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	113 Json::Value result;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	114 answers.ToJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	115 call.GetOutput().AnswerJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	116 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	117
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	118 static void DicomFindStudy(RestApi::PostCall& call)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	119 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	120 DicomMap m;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	121 DicomMap::SetupFindStudyTemplate(m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	122 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	123 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	124 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	125 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	126
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	127 if (m.GetValue(DICOM_TAG_ACCESSION_NUMBER).AsString().size() <= 2 &&
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	128 m.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	129 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	130 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	131 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	132
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	133 DicomUserConnection connection;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	134 ConnectToModality(connection, call.GetUriComponent("id", ""));
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	135
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	136 DicomFindAnswers answers;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	137 connection.FindStudy(answers, m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	138
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	139 Json::Value result;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	140 answers.ToJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	141 call.GetOutput().AnswerJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	142 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	143
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	144 static void DicomFindSeries(RestApi::PostCall& call)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	145 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	146 DicomMap m;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	147 DicomMap::SetupFindSeriesTemplate(m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	148 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	149 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	150 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	151 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	152
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	153 if ((m.GetValue(DICOM_TAG_ACCESSION_NUMBER).AsString().size() <= 2 &&
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	154 m.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2) \|\|
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	155 m.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).AsString().size() <= 2)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	156 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	157 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	158 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	159
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	160 DicomUserConnection connection;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	161 ConnectToModality(connection, call.GetUriComponent("id", ""));
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	162
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	163 DicomFindAnswers answers;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	164 connection.FindSeries(answers, m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	165
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	166 Json::Value result;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	167 answers.ToJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	168 call.GetOutput().AnswerJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	169 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	170
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	171 static void DicomFind(RestApi::PostCall& call)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	172 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	173 DicomMap m;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	174 DicomMap::SetupFindPatientTemplate(m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	175 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	176 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	177 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	178 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	179
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	180 DicomUserConnection connection;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	181 ConnectToModality(connection, call.GetUriComponent("id", ""));
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	182
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	183 DicomFindAnswers patients;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	184 connection.FindPatient(patients, m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	185
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	186 // Loop over the found patients
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	187 Json::Value result = Json::arrayValue;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	188 for (size_t i = 0; i < patients.GetSize(); i++)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	189 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	190 Json::Value patient(Json::objectValue);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	191 FromDcmtkBridge::ToJson(patient, patients.GetAnswer(i));
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	192
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	193 DicomMap::SetupFindStudyTemplate(m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	194 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	195 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	196 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	197 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	198 m.CopyTagIfExists(patients.GetAnswer(i), DICOM_TAG_PATIENT_ID);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	199
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	200 DicomFindAnswers studies;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	201 connection.FindStudy(studies, m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	202
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	203 patient["Studies"] = Json::arrayValue;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	204
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	205 // Loop over the found studies
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	206 for (size_t j = 0; j < studies.GetSize(); j++)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	207 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	208 Json::Value study(Json::objectValue);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	209 FromDcmtkBridge::ToJson(study, studies.GetAnswer(j));
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	210
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	211 DicomMap::SetupFindSeriesTemplate(m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	212 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	213 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	214 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	215 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	216 m.CopyTagIfExists(studies.GetAnswer(j), DICOM_TAG_PATIENT_ID);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	217 m.CopyTagIfExists(studies.GetAnswer(j), DICOM_TAG_STUDY_INSTANCE_UID);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	218
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	219 DicomFindAnswers series;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	220 connection.FindSeries(series, m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	221
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	222 // Loop over the found series
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	223 study["Series"] = Json::arrayValue;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	224 for (size_t k = 0; k < series.GetSize(); k++)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	225 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	226 Json::Value series2(Json::objectValue);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	227 FromDcmtkBridge::ToJson(series2, series.GetAnswer(k));
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	228 study["Series"].append(series2);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	229 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	230
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	231 patient["Studies"].append(study);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	232 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	233
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	234 result.append(patient);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	235 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	236
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	237 call.GetOutput().AnswerJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	238 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	239
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	240
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	241 static void DicomStore(RestApi::PostCall& call)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	242 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	243 RETRIEVE_CONTEXT(call);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	244
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	245 DicomUserConnection connection;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	246 ConnectToModality(connection, call.GetUriComponent("id", ""));
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	247
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	248 Json::Value found;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	249 if (context.GetIndex().LookupResource(found, call.GetPostBody(), ResourceType_Series))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	250 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	251 // The UUID corresponds to a series
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	252 for (Json::Value::ArrayIndex i = 0; i < found["Instances"].size(); i++)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	253 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	254 std::string instanceId = found["Instances"][i].asString();
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	255 std::string dicom;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	256 context.ReadFile(dicom, instanceId, AttachedFileType_Dicom);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	257 connection.Store(dicom);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	258 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	259
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	260 call.GetOutput().AnswerBuffer("{}", "application/json");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	261 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	262 else if (context.GetIndex().LookupResource(found, call.GetPostBody(), ResourceType_Instance))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	263 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	264 // The UUID corresponds to an instance
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	265 std::string instanceId = call.GetPostBody();
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	266 std::string dicom;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	267 context.ReadFile(dicom, instanceId, AttachedFileType_Dicom);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	268 connection.Store(dicom);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	269
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	270 call.GetOutput().AnswerBuffer("{}", "application/json");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	271 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	272 else
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	273 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	274 // The POST body is not a known resource, assume that it
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	275 // contains a raw DICOM instance
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	276 connection.Store(call.GetPostBody());
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	277 call.GetOutput().AnswerBuffer("{}", "application/json");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	278 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	279 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	280
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	281
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	282
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283 // System information -------------------------------------------------------
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	284
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	285 static void ServeRoot(RestApi::GetCall& call)
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	286 {
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	287 call.GetOutput().Redirect("app/explorer.html");
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	288 }
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290 static void GetSystemInformation(RestApi::GetCall& call)
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292 RETRIEVE_CONTEXT(call);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294 Json::Value result = Json::objectValue;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 result["Version"] = ORTHANC_VERSION;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 result["Name"] = GetGlobalStringParameter("Name", "");
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	297 result["TotalCompressedSize"] = boost::lexical_cast<std::string>
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	298 (context.GetIndex().GetTotalCompressedSize());
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	299 result["TotalUncompressedSize"] = boost::lexical_cast<std::string>
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	300 (context.GetIndex().GetTotalUncompressedSize());
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	301
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 call.GetOutput().AnswerJson(result);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	306 // List all the patients, studies, series or instances ----------------------
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	307
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	308 template <enum ResourceType resourceType>
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	309 static void ListResources(RestApi::GetCall& call)
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	310 {
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	311 RETRIEVE_CONTEXT(call);
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	312
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	313 Json::Value result;
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	314 context.GetIndex().GetAllUuids(result, resourceType);
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	315 call.GetOutput().AnswerJson(result);
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	316 }
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	317
212 f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	318 template <enum ResourceType resourceType>
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	319 static void GetSingleResource(RestApi::GetCall& call)
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	320 {
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	321 RETRIEVE_CONTEXT(call);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	322
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	323 Json::Value result;
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	324 if (context.GetIndex().LookupResource(result, call.GetUriComponent("id", ""), resourceType))
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	325 {
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	326 call.GetOutput().AnswerJson(result);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	327 }
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	328 }
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	329
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	330 template <enum ResourceType resourceType>
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	331 static void DeleteSingleResource(RestApi::DeleteCall& call)
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	332 {
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	333 RETRIEVE_CONTEXT(call);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	334
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	335 Json::Value result;
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	336 if (context.GetIndex().DeleteResource(result, call.GetUriComponent("id", ""), resourceType))
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	337 {
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	338 call.GetOutput().AnswerJson(result);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	339 }
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	340 }
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	341
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	342
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 // Changes API --------------------------------------------------------------
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 static void GetChanges(RestApi::GetCall& call)
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 RETRIEVE_CONTEXT(call);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 static const unsigned int MAX_RESULTS = 100;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 ServerIndex& index = context.GetIndex();
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 //std::string filter = GetArgument(getArguments, "filter", "");
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 int64_t since;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 unsigned int limit;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 try
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 since = boost::lexical_cast<int64_t>(call.GetArgument("since", "0"));
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 limit = boost::lexical_cast<unsigned int>(call.GetArgument("limit", "0"));
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 catch (boost::bad_lexical_cast)
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 return;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 if (limit == 0 \|\| limit > MAX_RESULTS)
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 limit = MAX_RESULTS;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370 Json::Value result;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	371 if (index.GetChanges(result, since, limit))
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 call.GetOutput().AnswerJson(result);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	375 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	376
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	379 // Get information about a single instance ----------------------------------
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	380
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	381 static void GetInstanceFile(RestApi::GetCall& call)
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	382 {
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	383 RETRIEVE_CONTEXT(call);
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	384
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	385 std::string publicId = call.GetUriComponent("id", "");
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	386 context.AnswerFile(call.GetOutput(), publicId, AttachedFileType_Dicom);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	387 }
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	388
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	389
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	390 template <bool simplify>
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	391 static void GetInstanceTags(RestApi::GetCall& call)
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	392 {
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	393 RETRIEVE_CONTEXT(call);
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	394
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	395 std::string publicId = call.GetUriComponent("id", "");
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	396
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	397 Json::Value full;
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	398 context.ReadJson(full, publicId);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	399
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	400 if (simplify)
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	401 {
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	402 Json::Value simplified;
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	403 SimplifyTags(simplified, full);
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	404 call.GetOutput().AnswerJson(simplified);
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	405 }
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	406 else
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	407 {
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	408 call.GetOutput().AnswerJson(full);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	409 }
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	410 }
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	411
214 03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	412
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	413 static void ListFrames(RestApi::GetCall& call)
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	414 {
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	415 RETRIEVE_CONTEXT(call);
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	416
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	417 Json::Value instance;
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	418 if (context.GetIndex().LookupResource(instance, call.GetUriComponent("id", ""), ResourceType_Instance))
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	419 {
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	420 unsigned int numberOfFrames = 1;
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	421
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	422 try
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	423 {
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	424 Json::Value tmp = instance["MainDicomTags"]["NumberOfFrames"];
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	425 numberOfFrames = boost::lexical_cast<unsigned int>(tmp.asString());
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	426 }
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	427 catch (...)
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	428 {
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	429 }
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	430
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	431 Json::Value result = Json::arrayValue;
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	432 for (unsigned int i = 0; i < numberOfFrames; i++)
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	433 {
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	434 result.append(i);
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	435 }
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	436
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	437 call.GetOutput().AnswerJson(result);
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	438 }
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	439 }
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	440
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	441
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	442 template <enum ImageExtractionMode mode>
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	443 static void GetImage(RestApi::GetCall& call)
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	444 {
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	445 RETRIEVE_CONTEXT(call);
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	446
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	447 std::string frameId = call.GetUriComponent("frame", "0");
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	448
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	449 unsigned int frame;
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	450 try
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	451 {
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	452 frame = boost::lexical_cast<unsigned int>(frameId);
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	453 }
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	454 catch (boost::bad_lexical_cast)
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	455 {
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	456 return;
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	457 }
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	458
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	459 std::string publicId = call.GetUriComponent("id", "");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	460 std::string dicomContent, png;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	461 context.ReadFile(dicomContent, publicId, AttachedFileType_Dicom);
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	462
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	463 try
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	464 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	465 FromDcmtkBridge::ExtractPngImage(png, dicomContent, frame, mode);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	466 call.GetOutput().AnswerBuffer(png, "image/png");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	467 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	468 catch (OrthancException& e)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	469 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	470 if (e.GetErrorCode() == ErrorCode_ParameterOutOfRange)
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	471 {
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	472 // The frame number is out of the range for this DICOM
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	473 // instance, the resource is not existent
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	474 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	475 else
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	476 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	477 std::string root = "";
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	478 for (size_t i = 1; i < call.GetFullUri().size(); i++)
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	479 {
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	480 root += "../";
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	481 }
218 0200cd330582 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	482
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	483 call.GetOutput().Redirect(root + "app/images/unsupported.png");
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	484 }
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	485 }
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	486 }
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	487
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	488
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	489 // Upload of DICOM files through HTTP ---------------------------------------
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	490
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	491 static void UploadDicomFile(RestApi::PostCall& call)
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	492 {
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	493 RETRIEVE_CONTEXT(call);
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	494
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	495 const std::string& postData = call.GetPostBody();
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	496
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	497 LOG(INFO) << "Receiving a DICOM file of " << postData.size() << " bytes through HTTP";
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	498
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	499 // Prepare an input stream for the memory buffer
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	500 DcmInputBufferStream is;
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	501 if (postData.size() > 0)
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	502 {
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	503 is.setBuffer(&postData[0], postData.size());
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	504 }
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	505 is.setEos();
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	506
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	507 DcmFileFormat dicomFile;
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	508 if (!dicomFile.read(is).good())
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	509 {
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	510 call.GetOutput().SignalError(Orthanc_HttpStatus_415_UnsupportedMediaType);
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	511 return;
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	512 }
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	513
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	514 DicomMap dicomSummary;
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	515 FromDcmtkBridge::Convert(dicomSummary, *dicomFile.getDataset());
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	516
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	517 DicomInstanceHasher hasher(dicomSummary);
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	518
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	519 Json::Value dicomJson;
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	520 FromDcmtkBridge::ToJson(dicomJson, *dicomFile.getDataset());
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	521
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	522 StoreStatus status = StoreStatus_Failure;
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	523 if (postData.size() > 0)
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	524 {
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	525 status = context.Store
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	526 (reinterpret_cast<const char*>(&postData[0]),
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	527 postData.size(), dicomSummary, dicomJson, "");
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	528 }
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	529
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	530 Json::Value result = Json::objectValue;
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	531
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	532 if (status != StoreStatus_Failure)
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	533 {
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	534 result["ID"] = hasher.HashInstance();
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	535 result["Path"] = GetBasePath(ResourceType_Instance, hasher.HashInstance());
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	536 }
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	537
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	538 result["Status"] = ToString(status);
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	539 call.GetOutput().AnswerJson(result);
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	540 }
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	541
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	543 // DICOM bridge -------------------------------------------------------------
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	545 static bool IsExistingModality(const OrthancRestApi2::Modalities& modalities,
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	546 const std::string& id)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	547 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	548 return modalities.find(id) != modalities.end();
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	549 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	550
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551 static void ListModalities(RestApi::GetCall& call)
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552 {
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	553 RETRIEVE_MODALITIES(call);
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 Json::Value result = Json::arrayValue;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556 for (OrthancRestApi2::Modalities::const_iterator
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	557 it = modalities.begin(); it != modalities.end(); it++)
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	559 result.append(*it);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	560 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	561
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	562 call.GetOutput().AnswerJson(result);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	563 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	564
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	565
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	566 static void ListModalityOperations(RestApi::GetCall& call)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	567 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	568 RETRIEVE_MODALITIES(call);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	569
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	570 std::string id = call.GetUriComponent("id", "");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	571 if (IsExistingModality(modalities, id))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	572 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	573 Json::Value result = Json::arrayValue;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	574 result.append("find-patient");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	575 result.append("find-study");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	576 result.append("find-series");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	577 result.append("find");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	578 result.append("store");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	579 call.GetOutput().AnswerJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	580 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	581 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	582
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	583
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	584
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	585 // Registration of the various REST handlers --------------------------------
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	586
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	587 OrthancRestApi2::OrthancRestApi2(ServerContext& context) :
4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	588 context_(context)
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590 GetListOfDicomModalities(modalities_);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	592 Register("/", ServeRoot);
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 Register("/system", GetSystemInformation);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 Register("/changes", GetChanges);
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	595
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	596 Register("/instances", UploadDicomFile);
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	597 Register("/instances", ListResources<ResourceType_Instance>);
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	598 Register("/patients", ListResources<ResourceType_Patient>);
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	599 Register("/series", ListResources<ResourceType_Series>);
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	600 Register("/studies", ListResources<ResourceType_Study>);
212 f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	601
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	602 Register("/instances/{id}", DeleteSingleResource<ResourceType_Instance>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	603 Register("/instances/{id}", GetSingleResource<ResourceType_Instance>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	604 Register("/patients/{id}", DeleteSingleResource<ResourceType_Patient>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	605 Register("/patients/{id}", GetSingleResource<ResourceType_Patient>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	606 Register("/series/{id}", DeleteSingleResource<ResourceType_Series>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	607 Register("/series/{id}", GetSingleResource<ResourceType_Series>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	608 Register("/studies/{id}", DeleteSingleResource<ResourceType_Study>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	609 Register("/studies/{id}", GetSingleResource<ResourceType_Study>);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	610
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	611 Register("/instances/{id}/file", GetInstanceFile);
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	612 Register("/instances/{id}/tags", GetInstanceTags<false>);
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	613 Register("/instances/{id}/simplified-tags", GetInstanceTags<true>);
214 03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	614 Register("/instances/{id}/frames", ListFrames);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	615
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	616 Register("/instances/{id}/frames/{frame}/preview", GetImage<ImageExtractionMode_Preview>);
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	617 Register("/instances/{id}/frames/{frame}/image-uint8", GetImage<ImageExtractionMode_UInt8>);
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	618 Register("/instances/{id}/frames/{frame}/image-uint16", GetImage<ImageExtractionMode_UInt16>);
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	619 Register("/instances/{id}/preview", GetImage<ImageExtractionMode_Preview>);
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	620 Register("/instances/{id}/image-uint8", GetImage<ImageExtractionMode_UInt8>);
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	621 Register("/instances/{id}/image-uint16", GetImage<ImageExtractionMode_UInt16>);
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	622
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	623 Register("/modalities", ListModalities);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	624 Register("/modalities/{id}", ListModalityOperations);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	625 Register("/modalities/{id}/find-patient", DicomFindPatient);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	626 Register("/modalities/{id}/find-study", DicomFindStudy);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	627 Register("/modalities/{id}/find-series", DicomFindSeries);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	628 Register("/modalities/{id}/find", DicomFind);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	629 Register("/modalities/{id}/store", DicomStore);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	630
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	631 // TODO : "content"
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	632 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	633 }

Mercurial > hg > orthanc

annotate OrthancServer/OrthancRestApi2.cpp @ 227:209ca3f6db62