orthanc: OrthancServer/OrthancRestApi/OrthancRestApi.cpp annotate

annotate OrthancServer/OrthancRestApi/OrthancRestApi.cpp @ 750:4afad8cb94fd

moves

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 14 Apr 2014 10:27:53 +0200
parents	OrthancServer/OrthancRestApi.cpp@478f4f9de9eb
children	5197fd35333c

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
689 2d0a347e8cfc switch to 2014 Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege,
210 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
230 ae2367145b49 renames Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	33 #include "OrthancRestApi.h"
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34
750 4afad8cb94fd moves Sebastien Jodogne <s.jodogne@gmail.com> parents: 746 diff changeset	35 #include "../../Core/Compression/HierarchicalZipWriter.h"
4afad8cb94fd moves Sebastien Jodogne <s.jodogne@gmail.com> parents: 746 diff changeset	36 #include "../../Core/HttpClient.h"
4afad8cb94fd moves Sebastien Jodogne <s.jodogne@gmail.com> parents: 746 diff changeset	37 #include "../../Core/HttpServer/FilesystemHttpSender.h"
4afad8cb94fd moves Sebastien Jodogne <s.jodogne@gmail.com> parents: 746 diff changeset	38 #include "../../Core/Uuid.h"
4afad8cb94fd moves Sebastien Jodogne <s.jodogne@gmail.com> parents: 746 diff changeset	39 #include "../DicomProtocol/DicomUserConnection.h"
4afad8cb94fd moves Sebastien Jodogne <s.jodogne@gmail.com> parents: 746 diff changeset	40 #include "../FromDcmtkBridge.h"
4afad8cb94fd moves Sebastien Jodogne <s.jodogne@gmail.com> parents: 746 diff changeset	41 #include "../OrthancInitialization.h"
4afad8cb94fd moves Sebastien Jodogne <s.jodogne@gmail.com> parents: 746 diff changeset	42 #include "../ServerToolbox.h"
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 #include <dcmtk/dcmdata/dcistrmb.h>
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 #include <dcmtk/dcmdata/dcfilefo.h>
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 #include <boost/lexical_cast.hpp>
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	47 #include <glog/logging.h>
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48
650 3a74026fc1b1 patch for visual studio jodogne parents: 648 diff changeset	49 #if defined(_MSC_VER)
3a74026fc1b1 patch for visual studio jodogne parents: 648 diff changeset	50 #define snprintf _snprintf
3a74026fc1b1 patch for visual studio jodogne parents: 648 diff changeset	51 #endif
3a74026fc1b1 patch for visual studio jodogne parents: 648 diff changeset	52
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	53 static const uint64_t MEGA_BYTES = 1024 * 1024;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	54 static const uint64_t GIGA_BYTES = 1024 * 1024 * 1024;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	55
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 namespace Orthanc
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 {
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	59 // TODO IMPROVE MULTITHREADING
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	60 // Every call to "ParsedDicomFile" must lock this mutex!!!
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	61 static boost::mutex cacheMutex_;
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	62
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	63
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	64 // DICOM SCU ----------------------------------------------------------------
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 static bool MergeQueryAndTemplate(DicomMap& result,
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	67 const std::string& postData)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	68 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	69 Json::Value query;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	70 Json::Reader reader;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	71
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	72 if (!reader.parse(postData, query) \|\|
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	73 query.type() != Json::objectValue)
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 return false;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	76 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	77
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	78 Json::Value::Members members = query.getMemberNames();
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	79 for (size_t i = 0; i < members.size(); i++)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	80 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	81 DicomTag t = FromDcmtkBridge::ParseTag(members[i]);
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	82 result.SetValue(t, query[members[i]].asString());
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	83 }
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 true;
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 static void DicomFindPatient(RestApi::PostCall& call)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	89 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	90 DicomMap m;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	91 DicomMap::SetupFindPatientTemplate(m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	92 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
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 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	95 }
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 DicomUserConnection connection;
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 602 diff changeset	98 ConnectToModalityUsingSymbolicName(connection, call.GetUriComponent("id", ""));
227 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 DicomFindAnswers answers;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	101 connection.FindPatient(answers, m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	102
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	103 Json::Value result;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	104 answers.ToJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	105 call.GetOutput().AnswerJson(result);
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
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	108 static void DicomFindStudy(RestApi::PostCall& call)
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 DicomMap m;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	111 DicomMap::SetupFindStudyTemplate(m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	112 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	113 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	114 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	115 }
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 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	118 m.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2)
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 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	121 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	122
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	123 DicomUserConnection connection;
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 602 diff changeset	124 ConnectToModalityUsingSymbolicName(connection, call.GetUriComponent("id", ""));
227 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 DicomFindAnswers answers;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	127 connection.FindStudy(answers, m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	128
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	129 Json::Value result;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	130 answers.ToJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	131 call.GetOutput().AnswerJson(result);
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
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	134 static void DicomFindSeries(RestApi::PostCall& call)
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 DicomMap m;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	137 DicomMap::SetupFindSeriesTemplate(m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	138 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	139 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	140 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	141 }
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 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	144 m.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2) \|\|
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	145 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	146 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	147 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	148 }
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 DicomUserConnection connection;
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 602 diff changeset	151 ConnectToModalityUsingSymbolicName(connection, call.GetUriComponent("id", ""));
227 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 DicomFindAnswers answers;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	154 connection.FindSeries(answers, m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	155
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	156 Json::Value result;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	157 answers.ToJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	158 call.GetOutput().AnswerJson(result);
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
499 7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	161 static void DicomFindInstance(RestApi::PostCall& call)
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	162 {
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	163 DicomMap m;
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	164 DicomMap::SetupFindInstanceTemplate(m);
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	165 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	166 {
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	167 return;
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	168 }
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	169
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	170 if ((m.GetValue(DICOM_TAG_ACCESSION_NUMBER).AsString().size() <= 2 &&
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	171 m.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2) \|\|
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	172 m.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).AsString().size() <= 2 \|\|
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	173 m.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).AsString().size() <= 2)
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	174 {
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	175 return;
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	176 }
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	177
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	178 DicomUserConnection connection;
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 602 diff changeset	179 ConnectToModalityUsingSymbolicName(connection, call.GetUriComponent("id", ""));
499 7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	180
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	181 DicomFindAnswers answers;
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	182 connection.FindInstance(answers, m);
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	183
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	184 Json::Value result;
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	185 answers.ToJson(result);
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	186 call.GetOutput().AnswerJson(result);
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	187 }
7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	188
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	189 static void DicomFind(RestApi::PostCall& call)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	190 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	191 DicomMap m;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	192 DicomMap::SetupFindPatientTemplate(m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	193 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	194 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	195 return;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	196 }
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 DicomUserConnection connection;
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 602 diff changeset	199 ConnectToModalityUsingSymbolicName(connection, call.GetUriComponent("id", ""));
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	200
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	201 DicomFindAnswers patients;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	202 connection.FindPatient(patients, m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	203
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	204 // Loop over the found patients
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	205 Json::Value result = Json::arrayValue;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	206 for (size_t i = 0; i < patients.GetSize(); i++)
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 patient(Json::objectValue);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	209 FromDcmtkBridge::ToJson(patient, patients.GetAnswer(i));
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::SetupFindStudyTemplate(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(patients.GetAnswer(i), DICOM_TAG_PATIENT_ID);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	217
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	218 DicomFindAnswers studies;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	219 connection.FindStudy(studies, m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	220
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	221 patient["Studies"] = Json::arrayValue;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	222
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	223 // Loop over the found studies
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	224 for (size_t j = 0; j < studies.GetSize(); j++)
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 study(Json::objectValue);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	227 FromDcmtkBridge::ToJson(study, studies.GetAnswer(j));
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	228
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	229 DicomMap::SetupFindSeriesTemplate(m);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	230 if (!MergeQueryAndTemplate(m, call.GetPostBody()))
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	231 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	232 return;
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 m.CopyTagIfExists(studies.GetAnswer(j), DICOM_TAG_PATIENT_ID);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	235 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	236
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	237 DicomFindAnswers series;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	238 connection.FindSeries(series, m);
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 // Loop over the found series
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	241 study["Series"] = Json::arrayValue;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	242 for (size_t k = 0; k < series.GetSize(); k++)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	243 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	244 Json::Value series2(Json::objectValue);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	245 FromDcmtkBridge::ToJson(series2, series.GetAnswer(k));
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	246 study["Series"].append(series2);
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
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	249 patient["Studies"].append(study);
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
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	252 result.append(patient);
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
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	255 call.GetOutput().AnswerJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	256 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	257
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	258
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	259 static bool GetInstancesToExport(std::list<std::string>& instances,
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	260 const std::string& remote,
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	261 RestApi::PostCall& call)
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	262 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	263 ServerContext& context = OrthancRestApi::GetContext(call);
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	264
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	265 std::string stripped = Toolbox::StripSpaces(call.GetPostBody());
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	266
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	267 Json::Value request;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	268 if (Toolbox::IsSHA1(stripped))
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	269 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	270 // This is for compatibility with Orthanc <= 0.5.1.
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	271 request = stripped;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	272 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	273 else if (!call.ParseJsonRequest(request))
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	274 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	275 // Bad JSON request
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	276 return false;
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	277 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	278
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	279 if (request.isString())
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	280 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	281 context.GetIndex().LogExportedResource(request.asString(), remote);
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	282 context.GetIndex().GetChildInstances(instances, request.asString());
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	283 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	284 else if (request.isArray())
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	285 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	286 for (Json::Value::ArrayIndex i = 0; i < request.size(); i++)
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	287 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	288 if (!request[i].isString())
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	289 {
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	290 return false;
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	291 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	292
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	293 std::string stripped = Toolbox::StripSpaces(request[i].asString());
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	294 if (!Toolbox::IsSHA1(stripped))
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	295 {
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	296 return false;
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	297 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	298
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	299 context.GetIndex().LogExportedResource(stripped, remote);
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	300
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	301 std::list<std::string> tmp;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	302 context.GetIndex().GetChildInstances(tmp, stripped);
663 95b4c6d89c42 fix for visual studio jodogne parents: 656 diff changeset	303
95b4c6d89c42 fix for visual studio jodogne parents: 656 diff changeset	304 for (std::list<std::string>::const_iterator
664 855adbdd75a6 fix indentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 663 diff changeset	305 it = tmp.begin(); it != tmp.end(); ++it)
663 95b4c6d89c42 fix for visual studio jodogne parents: 656 diff changeset	306 {
95b4c6d89c42 fix for visual studio jodogne parents: 656 diff changeset	307 instances.push_back(*it);
95b4c6d89c42 fix for visual studio jodogne parents: 656 diff changeset	308 }
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	309 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	310 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	311 else
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	312 {
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	313 // Neither a string, nor a list of strings. Bad request.
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	314 return false;
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	315 }
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	316
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	317 return true;
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	318 }
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	319
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	320
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	321 static void DicomStore(RestApi::PostCall& call)
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	322 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	323 ServerContext& context = OrthancRestApi::GetContext(call);
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	324
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	325 std::string remote = call.GetUriComponent("id", "");
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	326
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	327 std::list<std::string> instances;
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	328 if (!GetInstancesToExport(instances, remote, call))
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	329 {
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	330 return;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	331 }
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	332
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	333 DicomUserConnection connection;
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 602 diff changeset	334 ConnectToModalityUsingSymbolicName(connection, remote);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	335
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	336 for (std::list<std::string>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 650 diff changeset	337 it = instances.begin(); it != instances.end(); ++it)
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	338 {
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	339 LOG(INFO) << "Sending resource " << *it << " to modality \"" << remote << "\"";
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	340
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	341 std::string dicom;
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	342 context.ReadFile(dicom, *it, FileContentType_Dicom);
d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	343 connection.Store(dicom);
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	344 }
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	345
402 d2c69150a979 bulk storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	346 call.GetOutput().AnswerBuffer("{}", "application/json");
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	347 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	348
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	349
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	350
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 // System information -------------------------------------------------------
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	352
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	353 static void ServeRoot(RestApi::GetCall& call)
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	354 {
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	355 call.GetOutput().Redirect("app/explorer.html");
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	356 }
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 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	359 {
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	360 Json::Value result = Json::objectValue;
210 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 result["Version"] = ORTHANC_VERSION;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 result["Name"] = GetGlobalStringParameter("Name", "");
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	364
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	365 call.GetOutput().AnswerJson(result);
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	366 }
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	367
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	368 static void GetStatistics(RestApi::GetCall& call)
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	369 {
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	370 Json::Value result = Json::objectValue;
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	371 OrthancRestApi::GetIndex(call).ComputeStatistics(result);
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372 call.GetOutput().AnswerJson(result);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374
342 a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	375 static void GenerateUid(RestApi::GetCall& call)
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	376 {
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	377 std::string level = call.GetArgument("level", "");
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	378 if (level == "patient")
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	379 {
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	380 call.GetOutput().AnswerBuffer(FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Patient), "text/plain");
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	381 }
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	382 else if (level == "study")
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	383 {
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	384 call.GetOutput().AnswerBuffer(FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Study), "text/plain");
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	385 }
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	386 else if (level == "series")
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	387 {
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	388 call.GetOutput().AnswerBuffer(FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Series), "text/plain");
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	389 }
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	390 else if (level == "instance")
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	391 {
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	392 call.GetOutput().AnswerBuffer(FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Instance), "text/plain");
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	393 }
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	394 }
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	395
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	396 static void ExecuteScript(RestApi::PostCall& call)
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	397 {
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	398 std::string result;
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	399 ServerContext& context = OrthancRestApi::GetContext(call);
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	400 context.GetLuaContext().Execute(result, call.GetPostBody());
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	401 call.GetOutput().AnswerBuffer(result, "text/plain");
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	402 }
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	403
446 b7ef1a7d857e /tools/now Sebastien Jodogne <s.jodogne@gmail.com> parents: 443 diff changeset	404 static void GetNowIsoString(RestApi::GetCall& call)
b7ef1a7d857e /tools/now Sebastien Jodogne <s.jodogne@gmail.com> parents: 443 diff changeset	405 {
b7ef1a7d857e /tools/now Sebastien Jodogne <s.jodogne@gmail.com> parents: 443 diff changeset	406 call.GetOutput().AnswerBuffer(Toolbox::GetNowIsoString(), "text/plain");
b7ef1a7d857e /tools/now Sebastien Jodogne <s.jodogne@gmail.com> parents: 443 diff changeset	407 }
b7ef1a7d857e /tools/now Sebastien Jodogne <s.jodogne@gmail.com> parents: 443 diff changeset	408
b7ef1a7d857e /tools/now Sebastien Jodogne <s.jodogne@gmail.com> parents: 443 diff changeset	409
b7ef1a7d857e /tools/now Sebastien Jodogne <s.jodogne@gmail.com> parents: 443 diff changeset	410
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	411
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	412
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	414 // List all the patients, studies, series or instances ----------------------
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	415
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	416 template <enum ResourceType resourceType>
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	417 static void ListResources(RestApi::GetCall& call)
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	418 {
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	419 Json::Value result;
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	420 OrthancRestApi::GetIndex(call).GetAllUuids(result, resourceType);
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	421 call.GetOutput().AnswerJson(result);
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	422 }
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	423
212 f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	424 template <enum ResourceType resourceType>
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	425 static void GetSingleResource(RestApi::GetCall& call)
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	426 {
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	427 Json::Value result;
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	428 if (OrthancRestApi::GetIndex(call).LookupResource(result, call.GetUriComponent("id", ""), resourceType))
212 f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	429 {
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	430 call.GetOutput().AnswerJson(result);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	431 }
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	432 }
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	433
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	434 template <enum ResourceType resourceType>
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	435 static void DeleteSingleResource(RestApi::DeleteCall& call)
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	436 {
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	437 Json::Value result;
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	438 if (OrthancRestApi::GetIndex(call).DeleteResource(result, call.GetUriComponent("id", ""), resourceType))
212 f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	439 {
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	440 call.GetOutput().AnswerJson(result);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	441 }
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	442 }
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	443
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	444
248 2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	445 // Download of ZIP files ----------------------------------------------------
2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	446
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	447
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	448 static std::string GetDirectoryNameInArchive(const Json::Value& resource,
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	449 ResourceType resourceType)
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	450 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	451 switch (resourceType)
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	452 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	453 case ResourceType_Patient:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	454 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	455 std::string p = resource["MainDicomTags"]["PatientID"].asString();
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	456 std::string n = resource["MainDicomTags"]["PatientName"].asString();
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	457 return p + " " + n;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	458 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	459
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	460 case ResourceType_Study:
253 15fcd925b05b improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	461 {
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	462 return resource["MainDicomTags"]["StudyDescription"].asString();
253 15fcd925b05b improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	463 }
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	464
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	465 case ResourceType_Series:
253 15fcd925b05b improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	466 {
15fcd925b05b improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	467 std::string d = resource["MainDicomTags"]["SeriesDescription"].asString();
15fcd925b05b improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	468 std::string m = resource["MainDicomTags"]["Modality"].asString();
15fcd925b05b improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	469 return m + " " + d;
15fcd925b05b improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	470 }
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	471
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	472 default:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	473 throw OrthancException(ErrorCode_InternalError);
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	474 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	475 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	476
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	477 static bool CreateRootDirectoryInArchive(HierarchicalZipWriter& writer,
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	478 ServerContext& context,
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	479 const Json::Value& resource,
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	480 ResourceType resourceType)
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	481 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	482 if (resourceType == ResourceType_Patient)
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	483 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	484 return true;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	485 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	486
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	487 ResourceType parentType = GetParentResourceType(resourceType);
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	488 Json::Value parent;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	489
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	490 switch (resourceType)
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	491 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	492 case ResourceType_Study:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	493 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	494 if (!context.GetIndex().LookupResource(parent, resource["ParentPatient"].asString(), parentType))
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	495 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	496 return false;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	497 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	498
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	499 break;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	500 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	501
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	502 case ResourceType_Series:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	503 if (!context.GetIndex().LookupResource(parent, resource["ParentStudy"].asString(), parentType) \|\|
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	504 !CreateRootDirectoryInArchive(writer, context, parent, parentType))
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	505 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	506 return false;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	507 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	508 break;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	509
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	510 default:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	511 throw OrthancException(ErrorCode_NotImplemented);
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	512 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	513
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	514 writer.OpenDirectory(GetDirectoryNameInArchive(parent, parentType).c_str());
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	515 return true;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	516 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	517
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	518 static bool ArchiveInstance(HierarchicalZipWriter& writer,
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	519 ServerContext& context,
648 bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	520 const std::string& instancePublicId,
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	521 const char* filename)
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	522 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	523 Json::Value instance;
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	524
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	525 if (!context.GetIndex().LookupResource(instance, instancePublicId, ResourceType_Instance))
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	526 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	527 return false;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	528 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	529
648 bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	530 writer.OpenFile(filename);
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	531
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	532 std::string dicom;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	533 context.ReadFile(dicom, instancePublicId, FileContentType_Dicom);
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	534 writer.Write(dicom);
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	535
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	536 return true;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	537 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	538
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	539 static bool ArchiveInternal(HierarchicalZipWriter& writer,
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	540 ServerContext& context,
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	541 const std::string& publicId,
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	542 ResourceType resourceType,
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	543 bool isFirstLevel)
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	544 {
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	545 Json::Value resource;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	546 if (!context.GetIndex().LookupResource(resource, publicId, resourceType))
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	547 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	548 return false;
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	549 }
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	550
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	551 if (isFirstLevel &&
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	552 !CreateRootDirectoryInArchive(writer, context, resource, resourceType))
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	553 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	554 return false;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	555 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	556
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	557 writer.OpenDirectory(GetDirectoryNameInArchive(resource, resourceType).c_str());
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	558
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	559 switch (resourceType)
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	560 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	561 case ResourceType_Patient:
299 f13eef8ce651 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	562 for (Json::Value::ArrayIndex i = 0; i < resource["Studies"].size(); i++)
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	563 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	564 std::string studyId = resource["Studies"][i].asString();
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	565 if (!ArchiveInternal(writer, context, studyId, ResourceType_Study, false))
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	566 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	567 return false;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	568 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	569 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	570 break;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	571
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	572 case ResourceType_Study:
299 f13eef8ce651 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	573 for (Json::Value::ArrayIndex i = 0; i < resource["Series"].size(); i++)
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	574 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	575 std::string seriesId = resource["Series"][i].asString();
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	576 if (!ArchiveInternal(writer, context, seriesId, ResourceType_Series, false))
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	577 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	578 return false;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	579 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	580 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	581 break;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	582
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	583 case ResourceType_Series:
648 bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	584 {
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	585 // Create a filename prefix, depending on the modality
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	586 char format[16] = "%08d";
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	587
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	588 if (resource["MainDicomTags"].isMember("Modality"))
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	589 {
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	590 std::string modality = resource["MainDicomTags"]["Modality"].asString();
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	591
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	592 if (modality.size() == 1)
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	593 {
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	594 snprintf(format, sizeof(format) - 1, "%c%%07d", toupper(modality[0]));
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	595 }
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	596 else if (modality.size() >= 2)
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	597 {
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	598 snprintf(format, sizeof(format) - 1, "%c%c%%06d", toupper(modality[0]), toupper(modality[1]));
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	599 }
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	600 }
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	601
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	602 char filename[16];
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	603
299 f13eef8ce651 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	604 for (Json::Value::ArrayIndex i = 0; i < resource["Instances"].size(); i++)
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	605 {
648 bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	606 snprintf(filename, sizeof(filename) - 1, format, i);
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	607
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	608 std::string publicId = resource["Instances"][i].asString();
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	609
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	610 // This was the implementation up to Orthanc 0.7.0:
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	611 // std::string filename = instance["MainDicomTags"]["SOPInstanceUID"].asString() + ".dcm";
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	612
bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	613 if (!ArchiveInstance(writer, context, publicId, filename))
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	614 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	615 return false;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	616 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	617 }
648 bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	618
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	619 break;
648 bcf5c9a767a9 use filenames with 8 characters in ZIP files for maximum compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	620 }
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	621
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	622 default:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	623 throw OrthancException(ErrorCode_InternalError);
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	624 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	625
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	626 writer.CloseDirectory();
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	627 return true;
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	628 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	629
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	630 template <enum ResourceType resourceType>
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	631 static void GetArchive(RestApi::GetCall& call)
248 2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	632 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	633 ServerContext& context = OrthancRestApi::GetContext(call);
478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	634
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	635 std::string id = call.GetUriComponent("id", "");
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	636
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	637 /**
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	638 * Determine whether ZIP64 is required. Original ZIP format can
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	639 * store up to 2GB of data (some implementation supporting up to
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	640 * 4GB of data), and up to 65535 files.
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	641 * https://en.wikipedia.org/wiki/Zip_(file_format)#ZIP64
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	642 **/
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	643
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	644 uint64_t uncompressedSize;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	645 uint64_t compressedSize;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	646 unsigned int countStudies;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	647 unsigned int countSeries;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	648 unsigned int countInstances;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	649 context.GetIndex().GetStatistics(compressedSize, uncompressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	650 countStudies, countSeries, countInstances, id);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	651 const bool isZip64 = (uncompressedSize >= 2 * GIGA_BYTES \|\|
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	652 countInstances >= 65535);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	653
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	654 LOG(INFO) << "Creating a ZIP file with " << countInstances << " files of size "
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	655 << (uncompressedSize / MEGA_BYTES) << "MB using the "
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	656 << (isZip64 ? "ZIP64" : "ZIP32") << " file format";
248 2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	657
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	658 // Create a RAII for the temporary file to manage the ZIP file
248 2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	659 Toolbox::TemporaryFile tmp;
2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	660
2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	661 {
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	662 // Create a ZIP writer
248 2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	663 HierarchicalZipWriter writer(tmp.GetPath().c_str());
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 613 diff changeset	664 writer.SetZip64(isZip64);
248 2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	665
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	666 // Store the requested resource into the ZIP
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	667 if (!ArchiveInternal(writer, context, id, resourceType, true))
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	668 {
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	669 return;
248 2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	670 }
2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	671 }
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	672
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	673 // Prepare the sending of the ZIP file
248 2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	674 FilesystemHttpSender sender(tmp.GetPath().c_str());
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	675 sender.SetContentType("application/zip");
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	676 sender.SetDownloadFilename(id + ".zip");
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	677
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	678 // Send the ZIP
248 2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	679 call.GetOutput().AnswerFile(sender);
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	680
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	681 // The temporary file is automatically removed thanks to the RAII
248 2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	682 }
2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	683
2442033911d6 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 238 diff changeset	684
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685 // Changes API --------------------------------------------------------------
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	686
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	687 static void GetSinceAndLimit(int64_t& since,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	688 unsigned int& limit,
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	689 bool& last,
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	690 const RestApi::GetCall& call)
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	691 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 static const unsigned int MAX_RESULTS = 100;
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	693
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	694 if (call.HasArgument("last"))
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	695 {
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	696 last = true;
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	697 return;
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	698 }
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	699
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	700 last = false;
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	701
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	702 try
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	703 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	704 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	705 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	706 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	707 catch (boost::bad_lexical_cast)
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	708 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	709 return;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	710 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	711
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	712 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	713 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	714 limit = MAX_RESULTS;
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	715 }
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	716 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	717
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	718 static void GetChanges(RestApi::GetCall& call)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	719 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	720 ServerContext& context = OrthancRestApi::GetContext(call);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	721
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	722 //std::string filter = GetArgument(getArguments, "filter", "");
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	723 int64_t since;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	724 unsigned int limit;
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	725 bool last;
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	726 GetSinceAndLimit(since, limit, last, call);
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	728 Json::Value result;
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	729 if ((!last && context.GetIndex().GetChanges(result, since, limit)) \|\|
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	730 ( last && context.GetIndex().GetLastChange(result)))
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	731 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	732 call.GetOutput().AnswerJson(result);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	733 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	734 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	735
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	737 static void DeleteChanges(RestApi::DeleteCall& call)
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	738 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	739 OrthancRestApi::GetIndex(call).DeleteChanges();
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	740 call.GetOutput().AnswerBuffer("", "text/plain");
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	741 }
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	742
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	743
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	744 static void GetExports(RestApi::GetCall& call)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	745 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	746 ServerContext& context = OrthancRestApi::GetContext(call);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	747
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	748 int64_t since;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	749 unsigned int limit;
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	750 bool last;
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	751 GetSinceAndLimit(since, limit, last, call);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	752
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	753 Json::Value result;
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	754 if ((!last && context.GetIndex().GetExportedResources(result, since, limit)) \|\|
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	755 ( last && context.GetIndex().GetLastExportedResource(result)))
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	756 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	757 call.GetOutput().AnswerJson(result);
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	758 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	759 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 230 diff changeset	760
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	761
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	762 static void DeleteExports(RestApi::DeleteCall& call)
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	763 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	764 OrthancRestApi::GetIndex(call).DeleteExportedResources();
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	765 call.GetOutput().AnswerBuffer("", "text/plain");
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	766 }
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	767
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	768
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	769 // Get information about a single patient -----------------------------------
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	770
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	771 static void IsProtectedPatient(RestApi::GetCall& call)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	772 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	773 std::string publicId = call.GetUriComponent("id", "");
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	774 bool isProtected = OrthancRestApi::GetIndex(call).IsProtectedPatient(publicId);
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	775 call.GetOutput().AnswerBuffer(isProtected ? "1" : "0", "text/plain");
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	776 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	777
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	778
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	779 static void SetPatientProtection(RestApi::PutCall& call)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	780 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	781 ServerContext& context = OrthancRestApi::GetContext(call);
478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	782
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	783 std::string publicId = call.GetUriComponent("id", "");
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	784 std::string s = Toolbox::StripSpaces(call.GetPutBody());
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	785
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	786 if (s == "0")
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	787 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	788 context.GetIndex().SetProtectedPatient(publicId, false);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	789 call.GetOutput().AnswerBuffer("", "text/plain");
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	790 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	791 else if (s == "1")
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	792 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	793 context.GetIndex().SetProtectedPatient(publicId, true);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	794 call.GetOutput().AnswerBuffer("", "text/plain");
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	795 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	796 else
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	797 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	798 // Bad request
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	799 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	800 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	801
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	802
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	803 // 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	804
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	805 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	806 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	807 ServerContext& context = OrthancRestApi::GetContext(call);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	808
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	809 std::string publicId = call.GetUriComponent("id", "");
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	810 context.AnswerDicomFile(call.GetOutput(), publicId, FileContentType_Dicom);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	811 }
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	812
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	813
483 8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	814 static void ExportInstanceFile(RestApi::PostCall& call)
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	815 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	816 ServerContext& context = OrthancRestApi::GetContext(call);
483 8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	817
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	818 std::string publicId = call.GetUriComponent("id", "");
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	819
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	820 std::string dicom;
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	821 context.ReadFile(dicom, publicId, FileContentType_Dicom);
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	822
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	823 Toolbox::WriteFile(dicom, call.GetPostBody());
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	824
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	825 call.GetOutput().AnswerBuffer("{}", "application/json");
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	826 }
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	827
8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	828
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	829 template <bool simplify>
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	830 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	831 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	832 ServerContext& context = OrthancRestApi::GetContext(call);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	833
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	834 std::string publicId = call.GetUriComponent("id", "");
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	835
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	836 Json::Value full;
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	837 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	838
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	839 if (simplify)
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	840 {
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	841 Json::Value simplified;
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	842 SimplifyTags(simplified, full);
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	843 call.GetOutput().AnswerJson(simplified);
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	844 }
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	845 else
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	846 {
8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	847 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	848 }
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	849 }
4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	850
214 03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	851
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	852 static void ListFrames(RestApi::GetCall& call)
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	853 {
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	854 Json::Value instance;
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	855 if (OrthancRestApi::GetIndex(call).LookupResource(instance, call.GetUriComponent("id", ""), ResourceType_Instance))
214 03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	856 {
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	857 unsigned int numberOfFrames = 1;
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	858
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	859 try
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	860 {
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	861 Json::Value tmp = instance["MainDicomTags"]["NumberOfFrames"];
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	862 numberOfFrames = boost::lexical_cast<unsigned int>(tmp.asString());
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	863 }
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	864 catch (...)
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	865 {
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	866 }
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	867
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	868 Json::Value result = Json::arrayValue;
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	869 for (unsigned int i = 0; i < numberOfFrames; i++)
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	870 {
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	871 result.append(i);
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	872 }
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	873
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	874 call.GetOutput().AnswerJson(result);
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	875 }
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	876 }
03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	877
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	878
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	879 template <enum ImageExtractionMode mode>
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	880 static void GetImage(RestApi::GetCall& call)
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	881 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	882 ServerContext& context = OrthancRestApi::GetContext(call);
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	883
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	884 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	885
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	886 unsigned int frame;
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	887 try
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	888 {
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	889 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	890 }
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	891 catch (boost::bad_lexical_cast)
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	892 {
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	893 return;
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	894 }
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	895
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	896 std::string publicId = call.GetUriComponent("id", "");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	897 std::string dicomContent, png;
233 c11273198cef rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 232 diff changeset	898 context.ReadFile(dicomContent, publicId, FileContentType_Dicom);
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	899
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	900 try
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	901 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	902 FromDcmtkBridge::ExtractPngImage(png, dicomContent, frame, mode);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	903 call.GetOutput().AnswerBuffer(png, "image/png");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	904 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	905 catch (OrthancException& e)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	906 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	907 if (e.GetErrorCode() == ErrorCode_ParameterOutOfRange)
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	908 {
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	909 // 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	910 // instance, the resource is not existent
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	911 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	912 else
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	913 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	914 std::string root = "";
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	915 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	916 {
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	917 root += "../";
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	918 }
218 0200cd330582 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	919
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	920 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	921 }
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	922 }
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	923 }
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	924
c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	925
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	926 // Upload of DICOM files through HTTP ---------------------------------------
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	927
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	928 static void UploadDicomFile(RestApi::PostCall& call)
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	929 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	930 ServerContext& context = OrthancRestApi::GetContext(call);
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	931
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	932 const std::string& postData = call.GetPostBody();
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	933 if (postData.size() == 0)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	934 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	935 return;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	936 }
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	937
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	938 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	939
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	940 std::string publicId;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	941 StoreStatus status = context.Store(publicId, postData);
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	942 Json::Value result = Json::objectValue;
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	943
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	944 if (status != StoreStatus_Failure)
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	945 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	946 result["ID"] = publicId;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	947 result["Path"] = GetBasePath(ResourceType_Instance, publicId);
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	948 }
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	949
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	950 result["Status"] = EnumerationToString(status);
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	951 call.GetOutput().AnswerJson(result);
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	952 }
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	953
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	954
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	955
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	956 // DICOM bridge -------------------------------------------------------------
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	957
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	958 static bool IsExistingModality(const OrthancRestApi::SetOfStrings& modalities,
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	959 const std::string& id)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	960 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	961 return modalities.find(id) != modalities.end();
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	962 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	963
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	964 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	965 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	966 OrthancRestApi::SetOfStrings modalities;
478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	967 GetListOfDicomModalities(modalities);
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	968
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969 Json::Value result = Json::arrayValue;
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	970 for (OrthancRestApi::SetOfStrings::const_iterator
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	971 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	972 {
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	973 result.append(*it);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	974 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	975
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	976 call.GetOutput().AnswerJson(result);
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	977 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	978
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	979
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	980 static void ListModalityOperations(RestApi::GetCall& call)
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	981 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	982 OrthancRestApi::SetOfStrings modalities;
478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	983 GetListOfDicomModalities(modalities);
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	984
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	985 std::string id = call.GetUriComponent("id", "");
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	986 if (IsExistingModality(modalities, id))
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	987 {
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	988 Json::Value result = Json::arrayValue;
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	989 result.append("find-patient");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	990 result.append("find-study");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	991 result.append("find-series");
499 7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	992 result.append("find-instance");
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	993 result.append("find");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	994 result.append("store");
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	995 call.GetOutput().AnswerJson(result);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	996 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	997 }
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	998
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	999
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	1000
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1001 // Raw access to the DICOM tags of an instance ------------------------------
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1002
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1003 static void GetRawContent(RestApi::GetCall& call)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1004 {
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1005 boost::mutex::scoped_lock lock(cacheMutex_);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1006
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1007 ServerContext& context = OrthancRestApi::GetContext(call);
478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1008
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1009 std::string id = call.GetUriComponent("id", "");
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1010 ParsedDicomFile& dicom = context.GetDicomFile(id);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1011 dicom.SendPathValue(call.GetOutput(), call.GetTrailingUri());
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1012 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1013
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1014
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1015
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1016 // Modification of DICOM instances ------------------------------------------
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1017
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1018 namespace
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1019 {
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1020 typedef std::set<DicomTag> Removals;
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1021 typedef std::map<DicomTag, std::string> Replacements;
350 8031f9cfe7fe removal of old code Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	1022 typedef std::map< std::pair<DicomRootLevel, std::string>, std::string> UidMap;
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1023 }
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1024
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1025 static void ReplaceInstanceInternal(ParsedDicomFile& toModify,
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1026 const Removals& removals,
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1027 const Replacements& replacements,
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1028 DicomReplaceMode mode,
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1029 bool removePrivateTags)
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1030 {
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1031 if (removePrivateTags)
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1032 {
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1033 toModify.RemovePrivateTags();
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1034 }
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1035
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1036 for (Removals::const_iterator it = removals.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 650 diff changeset	1037 it != removals.end(); ++it)
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1038 {
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1039 toModify.Remove(*it);
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1040 }
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1041
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1042 for (Replacements::const_iterator it = replacements.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 650 diff changeset	1043 it != replacements.end(); ++it)
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1044 {
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1045 toModify.Replace(it->first, it->second, mode);
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1046 }
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1047
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1048 // A new SOP instance UID is automatically generated
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1049 std::string instanceUid = FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Instance);
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1050 toModify.Replace(DICOM_TAG_SOP_INSTANCE_UID, instanceUid, DicomReplaceMode_InsertIfAbsent);
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1051 }
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1052
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1053
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1054 static void ParseRemovals(Removals& target,
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1055 const Json::Value& removals)
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1056 {
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1057 if (!removals.isArray())
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1058 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1059 throw OrthancException(ErrorCode_BadRequest);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1060 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1061
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1062 for (Json::Value::ArrayIndex i = 0; i < removals.size(); i++)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1063 {
357 8d3a0db39967 fix of standalone builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1064 std::string name = removals[i].asString();
8d3a0db39967 fix of standalone builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1065 DicomTag tag = FromDcmtkBridge::ParseTag(name);
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1066 target.insert(tag);
357 8d3a0db39967 fix of standalone builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1067
8d3a0db39967 fix of standalone builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1068 VLOG(1) << "Removal: " << name << " " << tag << std::endl;
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1069 }
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1070 }
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1071
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1072
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1073 static void ParseReplacements(Replacements& target,
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1074 const Json::Value& replacements)
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1075 {
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1076 if (!replacements.isObject())
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1077 {
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1078 throw OrthancException(ErrorCode_BadRequest);
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1079 }
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1080
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1081 Json::Value::Members members = replacements.getMemberNames();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1082 for (size_t i = 0; i < members.size(); i++)
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1083 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1084 const std::string& name = members[i];
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1085 std::string value = replacements[name].asString();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1086
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1087 DicomTag tag = FromDcmtkBridge::ParseTag(name);
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1088 target[tag] = value;
357 8d3a0db39967 fix of standalone builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1089
8d3a0db39967 fix of standalone builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1090 VLOG(1) << "Replacement: " << name << " " << tag << " == " << value << std::endl;
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1091 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1092 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1093
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1094
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1095 static std::string GeneratePatientName(ServerContext& context)
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1096 {
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1097 uint64_t seq = context.GetIndex().IncrementGlobalSequence(GlobalProperty_AnonymizationSequence);
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1098 return "Anonymized" + boost::lexical_cast<std::string>(seq);
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1099 }
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1100
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1101
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1102 static void SetupAnonymization(Removals& removals,
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1103 Replacements& replacements)
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1104 {
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1105 // This is Table E.1-1 from PS 3.15-2008 - DICOM Part 15: Security and System Management Profiles
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1106 removals.insert(DicomTag(0x0008, 0x0014)); // Instance Creator UID
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1107 //removals.insert(DicomTag(0x0008, 0x0018)); // SOP Instance UID => set by ReplaceInstanceInternal()
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1108 removals.insert(DicomTag(0x0008, 0x0050)); // Accession Number
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1109 removals.insert(DicomTag(0x0008, 0x0080)); // Institution Name
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1110 removals.insert(DicomTag(0x0008, 0x0081)); // Institution Address
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1111 removals.insert(DicomTag(0x0008, 0x0090)); // Referring Physician's Name
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1112 removals.insert(DicomTag(0x0008, 0x0092)); // Referring Physician's Address
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1113 removals.insert(DicomTag(0x0008, 0x0094)); // Referring Physician's Telephone Numbers
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1114 removals.insert(DicomTag(0x0008, 0x1010)); // Station Name
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1115 removals.insert(DicomTag(0x0008, 0x1030)); // Study Description
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1116 removals.insert(DicomTag(0x0008, 0x103e)); // Series Description
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1117 removals.insert(DicomTag(0x0008, 0x1040)); // Institutional Department Name
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1118 removals.insert(DicomTag(0x0008, 0x1048)); // Physician(s) of Record
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1119 removals.insert(DicomTag(0x0008, 0x1050)); // Performing Physicians' Name
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1120 removals.insert(DicomTag(0x0008, 0x1060)); // Name of Physician(s) Reading Study
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1121 removals.insert(DicomTag(0x0008, 0x1070)); // Operators' Name
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1122 removals.insert(DicomTag(0x0008, 0x1080)); // Admitting Diagnoses Description
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1123 removals.insert(DicomTag(0x0008, 0x1155)); // Referenced SOP Instance UID
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1124 removals.insert(DicomTag(0x0008, 0x2111)); // Derivation Description
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1125 removals.insert(DicomTag(0x0010, 0x0010)); // Patient's Name
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1126 //removals.insert(DicomTag(0x0010, 0x0020)); // Patient ID => cf. below (*)
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1127 removals.insert(DicomTag(0x0010, 0x0030)); // Patient's Birth Date
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1128 removals.insert(DicomTag(0x0010, 0x0032)); // Patient's Birth Time
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1129 removals.insert(DicomTag(0x0010, 0x0040)); // Patient's Sex
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1130 removals.insert(DicomTag(0x0010, 0x1000)); // Other Patient Ids
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1131 removals.insert(DicomTag(0x0010, 0x1001)); // Other Patient Names
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1132 removals.insert(DicomTag(0x0010, 0x1010)); // Patient's Age
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1133 removals.insert(DicomTag(0x0010, 0x1020)); // Patient's Size
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1134 removals.insert(DicomTag(0x0010, 0x1030)); // Patient's Weight
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1135 removals.insert(DicomTag(0x0010, 0x1090)); // Medical Record Locator
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1136 removals.insert(DicomTag(0x0010, 0x2160)); // Ethnic Group
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1137 removals.insert(DicomTag(0x0010, 0x2180)); // Occupation
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1138 removals.insert(DicomTag(0x0010, 0x21b0)); // Additional Patient's History
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1139 removals.insert(DicomTag(0x0010, 0x4000)); // Patient Comments
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1140 removals.insert(DicomTag(0x0018, 0x1000)); // Device Serial Number
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1141 removals.insert(DicomTag(0x0018, 0x1030)); // Protocol Name
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1142 //removals.insert(DicomTag(0x0020, 0x000d)); // Study Instance UID => cf. below (*)
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1143 //removals.insert(DicomTag(0x0020, 0x000e)); // Series Instance UID => cf. below (*)
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1144 removals.insert(DicomTag(0x0020, 0x0010)); // Study ID
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1145 removals.insert(DicomTag(0x0020, 0x0052)); // Frame of Reference UID
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1146 removals.insert(DicomTag(0x0020, 0x0200)); // Synchronization Frame of Reference UID
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1147 removals.insert(DicomTag(0x0020, 0x4000)); // Image Comments
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1148 removals.insert(DicomTag(0x0040, 0x0275)); // Request Attributes Sequence
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1149 removals.insert(DicomTag(0x0040, 0xa124)); // UID
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1150 removals.insert(DicomTag(0x0040, 0xa730)); // Content Sequence
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1151 removals.insert(DicomTag(0x0088, 0x0140)); // Storage Media File-set UID
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1152 removals.insert(DicomTag(0x3006, 0x0024)); // Referenced Frame of Reference UID
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1153 removals.insert(DicomTag(0x3006, 0x00c2)); // Related Frame of Reference UID
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1154
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1155 /**
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1156 * (*) Patient ID, Study Instance UID and Series Instance UID
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1157 * are modified by "AnonymizeInstance()" if anonymizing a single
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1158 * instance, or by "RetrieveMappedUid()" if anonymizing a
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1159 * patient/study/series.
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1160 **/
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1161
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1162
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1163 // Some more removals (from the experience of DICOM files at the CHU of Liege)
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1164 removals.insert(DicomTag(0x0010, 0x1040)); // Patient's Address
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1165 removals.insert(DicomTag(0x0032, 0x1032)); // Requesting Physician
463 005aaeb63414 anonymization of PatientTelephoneNumbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	1166 removals.insert(DicomTag(0x0010, 0x2154)); // PatientTelephoneNumbers
527 d47ae896a754 anonymization of the medical alerts tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	1167 removals.insert(DicomTag(0x0010, 0x2000)); // Medical Alerts
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1168
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1169 // Set the DeidentificationMethod tag
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1170 replacements.insert(std::make_pair(DicomTag(0x0012, 0x0063), "Orthanc " ORTHANC_VERSION " - PS 3.15-2008 Table E.1-1"));
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1171
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1172 // Set the PatientIdentityRemoved tag
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1173 replacements.insert(std::make_pair(DicomTag(0x0012, 0x0062), "YES"));
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1174 }
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1175
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1176
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1177 static bool ParseModifyRequest(Removals& removals,
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1178 Replacements& replacements,
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1179 bool& removePrivateTags,
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1180 const RestApi::PostCall& call)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1181 {
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1182 removePrivateTags = false;
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1183 Json::Value request;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1184 if (call.ParseJsonRequest(request) &&
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1185 request.isObject())
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1186 {
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1187 Json::Value removalsPart = Json::arrayValue;
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1188 Json::Value replacementsPart = Json::objectValue;
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1189
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1190 if (request.isMember("Remove"))
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1191 {
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1192 removalsPart = request["Remove"];
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1193 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1194
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1195 if (request.isMember("Replace"))
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1196 {
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1197 replacementsPart = request["Replace"];
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1198 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1199
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1200 if (request.isMember("RemovePrivateTags"))
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1201 {
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1202 removePrivateTags = true;
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1203 }
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1204
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1205 ParseRemovals(removals, removalsPart);
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1206 ParseReplacements(replacements, replacementsPart);
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1207
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1208 return true;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1209 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1210 else
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1211 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1212 return false;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1213 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1214 }
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1215
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1216
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1217 static bool ParseAnonymizationRequest(Removals& removals,
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1218 Replacements& replacements,
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1219 bool& removePrivateTags,
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1220 bool& keepPatientId,
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1221 RestApi::PostCall& call)
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1222 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1223 ServerContext& context = OrthancRestApi::GetContext(call);
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1224
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1225 removePrivateTags = true;
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1226 keepPatientId = false;
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1227
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1228 Json::Value request;
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1229 if (call.ParseJsonRequest(request) &&
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1230 request.isObject())
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1231 {
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1232 Json::Value keepPart = Json::arrayValue;
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1233 Json::Value removalsPart = Json::arrayValue;
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1234 Json::Value replacementsPart = Json::objectValue;
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1235
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1236 if (request.isMember("Keep"))
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1237 {
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1238 keepPart = request["Keep"];
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1239 }
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1240
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1241 if (request.isMember("KeepPrivateTags"))
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1242 {
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1243 removePrivateTags = false;
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1244 }
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1245
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1246 if (request.isMember("Replace"))
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1247 {
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1248 replacementsPart = request["Replace"];
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1249 }
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1250
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1251 Removals toKeep;
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1252 ParseRemovals(toKeep, keepPart);
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1253
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1254 SetupAnonymization(removals, replacements);
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1255
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 650 diff changeset	1256 for (Removals::iterator it = toKeep.begin(); it != toKeep.end(); ++it)
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1257 {
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1258 if (*it == DICOM_TAG_PATIENT_ID)
d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1259 {
d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1260 keepPatientId = true;
d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1261 }
d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1262
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1263 removals.erase(*it);
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1264 }
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1265
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1266 Removals additionalRemovals;
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1267 ParseRemovals(additionalRemovals, removalsPart);
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1268
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1269 for (Removals::iterator it = additionalRemovals.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 650 diff changeset	1270 it != additionalRemovals.end(); ++it)
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1271 {
321 47a709e22d1f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 317 diff changeset	1272 removals.insert(*it);
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1273 }
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1274
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1275 ParseReplacements(replacements, replacementsPart);
1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1276
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1277 // Generate random Patient's Name if none is specified
557 48c9f83587a8 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 527 diff changeset	1278 if (toKeep.find(DICOM_TAG_PATIENT_NAME) == toKeep.end() &&
48c9f83587a8 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 527 diff changeset	1279 replacements.find(DICOM_TAG_PATIENT_NAME) == replacements.end())
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1280 {
557 48c9f83587a8 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 527 diff changeset	1281 replacements.insert(std::make_pair(DICOM_TAG_PATIENT_NAME, GeneratePatientName(context)));
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1282 }
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1283
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1284 return true;
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1285 }
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1286 else
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1287 {
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1288 return false;
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1289 }
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1290 }
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1291
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1292
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1293 static void AnonymizeOrModifyInstance(Removals& removals,
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1294 Replacements& replacements,
314 4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1295 bool removePrivateTags,
4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1296 RestApi::PostCall& call)
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 299 diff changeset	1297 {
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1298 boost::mutex::scoped_lock lock(cacheMutex_);
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1299 ServerContext& context = OrthancRestApi::GetContext(call);
478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1300
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 299 diff changeset	1301 std::string id = call.GetUriComponent("id", "");
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 299 diff changeset	1302 ParsedDicomFile& dicom = context.GetDicomFile(id);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 299 diff changeset	1303
314 4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1304 std::auto_ptr<ParsedDicomFile> modified(dicom.Clone());
4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1305 ReplaceInstanceInternal(*modified, removals, replacements, DicomReplaceMode_InsertIfAbsent, removePrivateTags);
4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1306 modified->Answer(call.GetOutput());
4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1307 }
4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1308
4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1309
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1310 static bool RetrieveMappedUid(ParsedDicomFile& dicom,
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1311 DicomRootLevel level,
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1312 Replacements& replacements,
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1313 UidMap& uidMap)
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1314 {
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1315 std::auto_ptr<DicomTag> tag;
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1316
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1317 switch (level)
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1318 {
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1319 case DicomRootLevel_Series:
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1320 tag.reset(new DicomTag(DICOM_TAG_SERIES_INSTANCE_UID));
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1321 break;
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1322
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1323 case DicomRootLevel_Study:
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1324 tag.reset(new DicomTag(DICOM_TAG_STUDY_INSTANCE_UID));
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1325 break;
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1326
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1327 case DicomRootLevel_Patient:
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1328 tag.reset(new DicomTag(DICOM_TAG_PATIENT_ID));
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1329 break;
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1330
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1331 default:
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1332 throw OrthancException(ErrorCode_InternalError);
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1333 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1334
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1335 std::string original;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1336 if (!dicom.GetTagValue(original, *tag))
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1337 {
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1338 throw OrthancException(ErrorCode_InternalError);
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1339 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1340
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1341 std::string mapped;
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1342 bool isNew;
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1343
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1344 UidMap::const_iterator previous = uidMap.find(std::make_pair(level, original));
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1345 if (previous == uidMap.end())
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1346 {
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1347 mapped = FromDcmtkBridge::GenerateUniqueIdentifier(level);
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1348 uidMap.insert(std::make_pair(std::make_pair(level, original), mapped));
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1349 isNew = true;
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1350 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1351 else
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1352 {
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1353 mapped = previous->second;
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1354 isNew = false;
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1355 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1356
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1357 replacements[*tag] = mapped;
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1358 return isNew;
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1359 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1360
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1361
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1362 static void AnonymizeOrModifyResource(Removals& removals,
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1363 Replacements& replacements,
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1364 bool removePrivateTags,
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1365 bool keepPatientId,
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1366 MetadataType metadataType,
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1367 ChangeType changeType,
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1368 ResourceType resourceType,
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1369 RestApi::PostCall& call)
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1370 {
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1371 typedef std::list<std::string> Instances;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1372
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1373 bool isFirst = true;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1374 Json::Value result(Json::objectValue);
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1375
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1376 boost::mutex::scoped_lock lock(cacheMutex_);
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1377 ServerContext& context = OrthancRestApi::GetContext(call);
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1378
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1379 Instances instances;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1380 std::string id = call.GetUriComponent("id", "");
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1381 context.GetIndex().GetChildInstances(instances, id);
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1382
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 650 diff changeset	1383 if (instances.empty())
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1384 {
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1385 return;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1386 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1387
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1388 /**
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1389 * Loop over all the instances of the resource.
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1390 **/
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1391
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1392 UidMap uidMap;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1393 for (Instances::const_iterator it = instances.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 650 diff changeset	1394 it != instances.end(); ++it)
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1395 {
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1396 LOG(INFO) << "Modifying instance " << *it;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1397 ParsedDicomFile& original = context.GetDicomFile(*it);
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1398
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1399 DicomInstanceHasher originalHasher = original.GetHasher();
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1400
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1401 if (isFirst && keepPatientId)
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1402 {
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1403 std::string patientId = originalHasher.GetPatientId();
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1404 uidMap[std::make_pair(DicomRootLevel_Patient, patientId)] = patientId;
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1405 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1406
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1407 bool isNewSeries = RetrieveMappedUid(original, DicomRootLevel_Series, replacements, uidMap);
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1408 bool isNewStudy = RetrieveMappedUid(original, DicomRootLevel_Study, replacements, uidMap);
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1409 bool isNewPatient = RetrieveMappedUid(original, DicomRootLevel_Patient, replacements, uidMap);
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1410
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1411
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1412 /**
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1413 * Compute the resulting DICOM instance and store it into the Orthanc store.
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1414 **/
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1415
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1416 std::auto_ptr<ParsedDicomFile> modified(original.Clone());
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1417 ReplaceInstanceInternal(*modified, removals, replacements, DicomReplaceMode_InsertIfAbsent, removePrivateTags);
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1418
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1419 std::string modifiedInstance;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1420 if (context.Store(modifiedInstance, modified->GetDicom()) != StoreStatus_Success)
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1421 {
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1422 LOG(ERROR) << "Error while storing a modified instance " << *it;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1423 return;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1424 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1425
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1426
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1427 /**
443 be93b666ed79 link anonymized to original resource in OrthancExplorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1428 * Record metadata information (AnonymizedFrom/ModifiedFrom).
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1429 **/
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1430
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1431 DicomInstanceHasher modifiedHasher = modified->GetHasher();
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1432
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1433 if (isNewSeries)
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1434 {
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1435 context.GetIndex().SetMetadata(modifiedHasher.HashSeries(),
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1436 metadataType, originalHasher.HashSeries());
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1437 }
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1438
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1439 if (isNewStudy)
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1440 {
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1441 context.GetIndex().SetMetadata(modifiedHasher.HashStudy(),
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1442 metadataType, originalHasher.HashStudy());
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1443 }
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1444
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1445 if (isNewPatient)
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1446 {
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1447 context.GetIndex().SetMetadata(modifiedHasher.HashPatient(),
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1448 metadataType, originalHasher.HashPatient());
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1449 }
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1450
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1451 assert(*it == originalHasher.HashInstance());
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1452 assert(modifiedInstance == modifiedHasher.HashInstance());
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1453 context.GetIndex().SetMetadata(modifiedInstance, metadataType, *it);
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1454
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1455
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1456 /**
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1457 * Compute the JSON object that is returned by the REST call.
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1458 **/
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1459
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1460 if (isFirst)
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1461 {
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1462 std::string newId;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1463
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1464 switch (resourceType)
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1465 {
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1466 case ResourceType_Series:
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1467 newId = modifiedHasher.HashSeries();
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1468 break;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1469
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1470 case ResourceType_Study:
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1471 newId = modifiedHasher.HashStudy();
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1472 break;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1473
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1474 case ResourceType_Patient:
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1475 newId = modifiedHasher.HashPatient();
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1476 break;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1477
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1478 default:
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1479 throw OrthancException(ErrorCode_InternalError);
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1480 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1481
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	1482 result["Type"] = EnumerationToString(resourceType);
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1483 result["ID"] = newId;
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1484 result["Path"] = GetBasePath(resourceType, newId);
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1485 result["PatientID"] = modifiedHasher.HashPatient();
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1486 isFirst = false;
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1487 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1488 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1489
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1490 call.GetOutput().AnswerJson(result);
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1491 }
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1492
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1493
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 344 diff changeset	1494
314 4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1495 static void ModifyInstance(RestApi::PostCall& call)
4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1496 {
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1497 Removals removals;
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1498 Replacements replacements;
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1499 bool removePrivateTags;
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1500
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1501 if (ParseModifyRequest(removals, replacements, removePrivateTags, call))
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1502 {
314 4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1503 AnonymizeOrModifyInstance(removals, replacements, removePrivateTags, call);
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1504 }
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1505 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1506
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1507
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1508 static void AnonymizeInstance(RestApi::PostCall& call)
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1509 {
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1510 Removals removals;
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1511 Replacements replacements;
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1512 bool removePrivateTags, keepPatientId;
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1513
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1514 if (ParseAnonymizationRequest(removals, replacements, removePrivateTags, keepPatientId, call))
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1515 {
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1516 // TODO Handle "keepPatientId"
d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1517
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1518 // Generate random patient ID if not specified
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1519 if (replacements.find(DICOM_TAG_PATIENT_ID) == replacements.end())
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1520 {
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1521 replacements.insert(std::make_pair(DICOM_TAG_PATIENT_ID,
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1522 FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Patient)));
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1523 }
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1524
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1525 // Generate random study UID if not specified
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1526 if (replacements.find(DICOM_TAG_STUDY_INSTANCE_UID) == replacements.end())
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1527 {
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1528 replacements.insert(std::make_pair(DICOM_TAG_STUDY_INSTANCE_UID,
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1529 FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Study)));
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1530 }
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1531
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1532 // Generate random series UID if not specified
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1533 if (replacements.find(DICOM_TAG_SERIES_INSTANCE_UID) == replacements.end())
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1534 {
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1535 replacements.insert(std::make_pair(DICOM_TAG_SERIES_INSTANCE_UID,
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1536 FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Series)));
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1537 }
a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1538
314 4f17834a50b6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 313 diff changeset	1539 AnonymizeOrModifyInstance(removals, replacements, removePrivateTags, call);
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1540 }
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1541 }
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1542
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1543
308 fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	1544 static void ModifySeriesInplace(RestApi::PostCall& call)
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1545 {
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1546 Removals removals;
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1547 Replacements replacements;
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1548 bool removePrivateTags;
308 fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	1549
312 1642a354fec8 flexible Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1550 if (ParseModifyRequest(removals, replacements, removePrivateTags, call))
308 fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	1551 {
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1552 AnonymizeOrModifyResource(removals, replacements, removePrivateTags, true /keepPatientId/,
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1553 MetadataType_ModifiedFrom, ChangeType_ModifiedSeries,
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1554 ResourceType_Series, call);
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1555 }
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1556 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1557
308 fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	1558
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1559 static void AnonymizeSeriesInplace(RestApi::PostCall& call)
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1560 {
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1561 Removals removals;
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1562 Replacements replacements;
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1563 bool removePrivateTags, keepPatientId;
308 fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	1564
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1565 if (ParseAnonymizationRequest(removals, replacements, removePrivateTags, keepPatientId, call))
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1566 {
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1567 AnonymizeOrModifyResource(removals, replacements, removePrivateTags, keepPatientId,
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1568 MetadataType_AnonymizedFrom, ChangeType_AnonymizedSeries,
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1569 ResourceType_Series, call);
308 fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	1570 }
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	1571 }
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	1572
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	1573
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1574 static void ModifyStudyInplace(RestApi::PostCall& call)
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1575 {
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1576 Removals removals;
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1577 Replacements replacements;
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1578 bool removePrivateTags;
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1579
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1580 if (ParseModifyRequest(removals, replacements, removePrivateTags, call))
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1581 {
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1582 AnonymizeOrModifyResource(removals, replacements, removePrivateTags, true /keepPatientId/,
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1583 MetadataType_ModifiedFrom, ChangeType_ModifiedStudy,
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1584 ResourceType_Study, call);
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1585 }
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1586 }
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1587
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1588
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1589 static void AnonymizeStudyInplace(RestApi::PostCall& call)
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1590 {
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1591 Removals removals;
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1592 Replacements replacements;
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1593 bool removePrivateTags, keepPatientId;
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1594
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1595 if (ParseAnonymizationRequest(removals, replacements, removePrivateTags, keepPatientId, call))
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1596 {
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1597 AnonymizeOrModifyResource(removals, replacements, removePrivateTags, keepPatientId,
349 c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1598 MetadataType_AnonymizedFrom, ChangeType_AnonymizedStudy,
c5edf0cc6e95 switch to refactored version Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	1599 ResourceType_Study, call);
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1600 }
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1601 }
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1602
308 fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	1603
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1604 /*static void ModifyPatientInplace(RestApi::PostCall& call)
351 64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1605 {
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1606 Removals removals;
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1607 Replacements replacements;
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1608 bool removePrivateTags;
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1609
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1610 if (ParseModifyRequest(removals, replacements, removePrivateTags, call))
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1611 {
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1612 AnonymizeOrModifyResource(false, removals, replacements, removePrivateTags,
351 64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1613 MetadataType_ModifiedFrom, ChangeType_ModifiedPatient,
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1614 ResourceType_Patient, call);
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1615 }
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	1616 }*/
351 64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1617
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1618
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1619 static void AnonymizePatientInplace(RestApi::PostCall& call)
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1620 {
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1621 Removals removals;
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1622 Replacements replacements;
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1623 bool removePrivateTags, keepPatientId;
351 64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1624
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1625 if (ParseAnonymizationRequest(removals, replacements, removePrivateTags, keepPatientId, call))
351 64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1626 {
602 d5043ff68d58 Possibility to keep the PatientID during an anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	1627 AnonymizeOrModifyResource(removals, replacements, removePrivateTags, keepPatientId,
351 64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1628 MetadataType_AnonymizedFrom, ChangeType_AnonymizedPatient,
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1629 ResourceType_Patient, call);
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1630 }
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1631 }
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1632
64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1633
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1634 // Handling of metadata -----------------------------------------------------
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1635
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1636 static void CheckValidResourceType(RestApi::Call& call)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1637 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1638 std::string resourceType = call.GetUriComponent("resourceType", "");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1639 StringToResourceType(resourceType.c_str());
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1640 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1641
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1642
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1643 static void ListMetadata(RestApi::GetCall& call)
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1644 {
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1645 CheckValidResourceType(call);
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1646
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1647 std::string publicId = call.GetUriComponent("id", "");
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1648 std::list<MetadataType> metadata;
739 696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1649
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1650 OrthancRestApi::GetIndex(call).ListAvailableMetadata(metadata, publicId);
739 696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1651 Json::Value result = Json::arrayValue;
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1652
739 696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1653 for (std::list<MetadataType>::const_iterator
696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1654 it = metadata.begin(); it != metadata.end(); ++it)
696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1655 {
696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1656 result.append(EnumerationToString(*it));
696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1657 }
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1658
739 696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1659 call.GetOutput().AnswerJson(result);
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1660 }
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1661
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1662
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1663 static void GetMetadata(RestApi::GetCall& call)
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1664 {
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1665 CheckValidResourceType(call);
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1666
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1667 std::string publicId = call.GetUriComponent("id", "");
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1668 std::string name = call.GetUriComponent("name", "");
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1669 MetadataType metadata = StringToMetadata(name);
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1670
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1671 std::string value;
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1672 if (OrthancRestApi::GetIndex(call).LookupMetadata(value, publicId, metadata))
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1673 {
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1674 call.GetOutput().AnswerBuffer(value, "text/plain");
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1675 }
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1676 }
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1677
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1678
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1679 static void DeleteMetadata(RestApi::DeleteCall& call)
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1680 {
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1681 CheckValidResourceType(call);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1682
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1683 std::string publicId = call.GetUriComponent("id", "");
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1684 std::string name = call.GetUriComponent("name", "");
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1685 MetadataType metadata = StringToMetadata(name);
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1686
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1687 if (metadata >= MetadataType_StartUser &&
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1688 metadata <= MetadataType_EndUser)
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1689 {
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1690 // It is forbidden to modify internal metadata
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1691 OrthancRestApi::GetIndex(call).DeleteMetadata(publicId, metadata);
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1692 call.GetOutput().AnswerBuffer("", "text/plain");
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1693 }
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1694 }
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1695
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	1696
437 beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1697 static void SetMetadata(RestApi::PutCall& call)
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1698 {
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1699 CheckValidResourceType(call);
437 beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1700
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1701 std::string publicId = call.GetUriComponent("id", "");
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1702 std::string name = call.GetUriComponent("name", "");
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1703 MetadataType metadata = StringToMetadata(name);
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1704 std::string value = call.GetPutBody();
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1705
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1706 if (metadata >= MetadataType_StartUser &&
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1707 metadata <= MetadataType_EndUser)
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1708 {
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1709 // It is forbidden to modify internal metadata
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1710 OrthancRestApi::GetIndex(call).SetMetadata(publicId, metadata, value);
437 beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1711 call.GetOutput().AnswerBuffer("", "text/plain");
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1712 }
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1713 }
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1714
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1715
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1716 static void GetResourceStatistics(RestApi::GetCall& call)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1717 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1718 std::string publicId = call.GetUriComponent("id", "");
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1719 Json::Value result;
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1720 OrthancRestApi::GetIndex(call).GetStatistics(result, publicId);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1721 call.GetOutput().AnswerJson(result);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1722 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1723
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1724
437 beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1725
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1726 // Orthanc Peers ------------------------------------------------------------
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1727
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1728 static bool IsExistingPeer(const OrthancRestApi::SetOfStrings& peers,
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1729 const std::string& id)
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1730 {
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1731 return peers.find(id) != peers.end();
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1732 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1733
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1734 static void ListPeers(RestApi::GetCall& call)
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1735 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1736 OrthancRestApi::SetOfStrings peers;
478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1737 GetListOfOrthancPeers(peers);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1738
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1739 Json::Value result = Json::arrayValue;
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1740 for (OrthancRestApi::SetOfStrings::const_iterator
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1741 it = peers.begin(); it != peers.end(); ++it)
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1742 {
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1743 result.append(*it);
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1744 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1745
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1746 call.GetOutput().AnswerJson(result);
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1747 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1748
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1749 static void ListPeerOperations(RestApi::GetCall& call)
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1750 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1751 OrthancRestApi::SetOfStrings peers;
478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1752 GetListOfOrthancPeers(peers);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1753
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1754 std::string id = call.GetUriComponent("id", "");
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1755 if (IsExistingPeer(peers, id))
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1756 {
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1757 Json::Value result = Json::arrayValue;
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1758 result.append("store");
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1759 call.GetOutput().AnswerJson(result);
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1760 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1761 }
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1762
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1763 static void PeerStore(RestApi::PostCall& call)
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1764 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1765 ServerContext& context = OrthancRestApi::GetContext(call);
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1766
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1767 std::string remote = call.GetUriComponent("id", "");
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1768
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1769 std::list<std::string> instances;
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1770 if (!GetInstancesToExport(instances, remote, call))
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1771 {
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1772 return;
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1773 }
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1774
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1775 std::string url, username, password;
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1776 GetOrthancPeer(remote, url, username, password);
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1777
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1778 // Configure the HTTP client
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1779 HttpClient client;
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1780 if (username.size() != 0 && password.size() != 0)
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1781 {
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1782 client.SetCredentials(username.c_str(), password.c_str());
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1783 }
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1784
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1785 client.SetUrl(url + "instances");
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1786 client.SetMethod(HttpMethod_Post);
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1787
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1788 // Loop over the instances that are to be sent
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1789 for (std::list<std::string>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 650 diff changeset	1790 it = instances.begin(); it != instances.end(); ++it)
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1791 {
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1792 LOG(INFO) << "Sending resource " << *it << " to peer \"" << remote << "\"";
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1793
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1794 context.ReadFile(client.AccessPostData(), *it, FileContentType_Dicom);
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1795
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1796 std::string answer;
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1797 if (!client.Apply(answer))
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1798 {
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1799 LOG(ERROR) << "Unable to send resource " << *it << " to peer \"" << remote << "\"";
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1800 return;
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1801 }
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1802 }
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1803
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1804 call.GetOutput().AnswerBuffer("{}", "application/json");
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1805 }
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1806
bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	1807
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1808
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1809
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	1810
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1811
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1812 // Handling of attached files -----------------------------------------------
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1813
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1814 static void ListAttachments(RestApi::GetCall& call)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1815 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1816 std::string resourceType = call.GetUriComponent("resourceType", "");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1817 std::string publicId = call.GetUriComponent("id", "");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1818 std::list<FileContentType> attachments;
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1819 OrthancRestApi::GetIndex(call).ListAvailableAttachments(attachments, publicId, StringToResourceType(resourceType.c_str()));
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1820
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1821 Json::Value result = Json::arrayValue;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1822
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1823 for (std::list<FileContentType>::const_iterator
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1824 it = attachments.begin(); it != attachments.end(); ++it)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1825 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1826 result.append(EnumerationToString(*it));
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1827 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1828
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1829 call.GetOutput().AnswerJson(result);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1830 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1831
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1832
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1833 static bool GetAttachmentInfo(FileInfo& info, RestApi::Call& call)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1834 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1835 CheckValidResourceType(call);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1836
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1837 std::string publicId = call.GetUriComponent("id", "");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1838 std::string name = call.GetUriComponent("name", "");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1839 FileContentType contentType = StringToContentType(name);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1840
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1841 return OrthancRestApi::GetIndex(call).LookupAttachment(info, publicId, contentType);
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1842 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1843
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1844
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1845 static void GetAttachmentOperations(RestApi::GetCall& call)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1846 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1847 FileInfo info;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1848 if (GetAttachmentInfo(info, call))
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1849 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1850 Json::Value operations = Json::arrayValue;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1851
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1852 operations.append("compressed-data");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1853
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1854 if (info.GetCompressedMD5() != "")
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1855 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1856 operations.append("compressed-md5");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1857 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1858
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1859 operations.append("compressed-size");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1860 operations.append("data");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1861
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1862 if (info.GetUncompressedMD5() != "")
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1863 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1864 operations.append("md5");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1865 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1866
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1867 operations.append("size");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1868
698 aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1869 if (info.GetCompressedMD5() != "" &&
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1870 info.GetUncompressedMD5() != "")
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1871 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1872 operations.append("verify-md5");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1873 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1874
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1875 call.GetOutput().AnswerJson(operations);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1876 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1877 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1878
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1879
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1880 template <int uncompress>
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1881 static void GetAttachmentData(RestApi::GetCall& call)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1882 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1883 ServerContext& context = OrthancRestApi::GetContext(call);
478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1884
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1885 CheckValidResourceType(call);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1886
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1887 std::string publicId = call.GetUriComponent("id", "");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1888 std::string name = call.GetUriComponent("name", "");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1889
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1890 std::string content;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1891 context.ReadFile(content, publicId, StringToContentType(name),
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1892 (uncompress == 1));
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1893
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1894 call.GetOutput().AnswerBuffer(content, "application/octet-stream");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1895 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1896
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1897
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1898 static void GetAttachmentSize(RestApi::GetCall& call)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1899 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1900 FileInfo info;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1901 if (GetAttachmentInfo(info, call))
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1902 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1903 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetUncompressedSize()), "text/plain");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1904 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1905 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1906
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1907
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1908 static void GetAttachmentCompressedSize(RestApi::GetCall& call)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1909 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1910 FileInfo info;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1911 if (GetAttachmentInfo(info, call))
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1912 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1913 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetCompressedSize()), "text/plain");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1914 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1915 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1916
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1917
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1918 static void GetAttachmentMD5(RestApi::GetCall& call)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1919 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1920 FileInfo info;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1921 if (GetAttachmentInfo(info, call) &&
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1922 info.GetUncompressedMD5() != "")
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1923 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1924 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetUncompressedMD5()), "text/plain");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1925 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1926 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1927
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1928
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1929 static void GetAttachmentCompressedMD5(RestApi::GetCall& call)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1930 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1931 FileInfo info;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1932 if (GetAttachmentInfo(info, call) &&
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1933 info.GetCompressedMD5() != "")
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1934 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1935 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetCompressedMD5()), "text/plain");
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1936 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1937 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1938
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1939
698 aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1940 static void VerifyAttachment(RestApi::PostCall& call)
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1941 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1942 ServerContext& context = OrthancRestApi::GetContext(call);
698 aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1943 CheckValidResourceType(call);
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1944
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1945 std::string publicId = call.GetUriComponent("id", "");
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1946 std::string name = call.GetUriComponent("name", "");
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1947
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1948 FileInfo info;
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1949 if (!GetAttachmentInfo(info, call) \|\|
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1950 info.GetCompressedMD5() == "" \|\|
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1951 info.GetUncompressedMD5() == "")
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1952 {
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1953 // Inexistent resource, or no MD5 available
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1954 return;
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1955 }
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1956
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1957 bool ok = false;
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1958
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1959 // First check whether the compressed data is correctly stored in the disk
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1960 std::string data;
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1961 context.ReadFile(data, publicId, StringToContentType(name), false);
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1962
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1963 std::string actualMD5;
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1964 Toolbox::ComputeMD5(actualMD5, data);
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1965
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1966 if (actualMD5 == info.GetCompressedMD5())
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1967 {
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1968 // The compressed data is OK. If a compression algorithm was
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1969 // applied to it, now check the MD5 of the uncompressed data.
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1970 if (info.GetCompressionType() == CompressionType_None)
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1971 {
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1972 ok = true;
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1973 }
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1974 else
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1975 {
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1976 context.ReadFile(data, publicId, StringToContentType(name), true);
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1977 Toolbox::ComputeMD5(actualMD5, data);
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1978 ok = (actualMD5 == info.GetUncompressedMD5());
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1979 }
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1980 }
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1981
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1982 if (ok)
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1983 {
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1984 LOG(INFO) << "The attachment " << name << " of resource " << publicId << " has the right MD5";
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1985 call.GetOutput().AnswerBuffer("{}", "application/json");
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1986 }
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1987 else
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1988 {
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1989 LOG(INFO) << "The attachment " << name << " of resource " << publicId << " has bad MD5!";
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1990 }
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1991 }
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1992
aae83e1e31f7 verify MD5 of attachments through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1993
701 f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	1994 static void UploadAttachment(RestApi::PutCall& call)
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	1995 {
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	1996 ServerContext& context = OrthancRestApi::GetContext(call);
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	1997 CheckValidResourceType(call);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	1998
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	1999 std::string publicId = call.GetUriComponent("id", "");
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	2000 std::string name = call.GetUriComponent("name", "");
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	2001
701 f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2002 const void* data = call.GetPutBody().size() ? &call.GetPutBody()[0] : NULL;
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	2003
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2004 FileContentType contentType = StringToContentType(name);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2005 if (contentType >= FileContentType_StartUser && // It is forbidden to modify internal attachments
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2006 contentType <= FileContentType_EndUser &&
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2007 context.AddAttachment(publicId, StringToContentType(name), data, call.GetPutBody().size()))
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	2008 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	2009 call.GetOutput().AnswerBuffer("{}", "application/json");
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	2010 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	2011 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	2012
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	2013
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2014 static void DeleteAttachment(RestApi::DeleteCall& call)
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2015 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2016 CheckValidResourceType(call);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2017
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2018 std::string publicId = call.GetUriComponent("id", "");
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2019 std::string name = call.GetUriComponent("name", "");
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2020 FileContentType contentType = StringToContentType(name);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2021
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2022 if (contentType >= FileContentType_StartUser &&
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2023 contentType <= FileContentType_EndUser)
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2024 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2025 // It is forbidden to delete internal attachments
746 478f4f9de9eb getting rid of macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 745 diff changeset	2026 OrthancRestApi::GetIndex(call).DeleteAttachment(publicId, contentType);
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2027 call.GetOutput().AnswerBuffer("{}", "application/json");
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2028 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2029 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2030
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2031
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2032
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	2033
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	2034 // 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	2035
230 ae2367145b49 renames Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	2036 OrthancRestApi::OrthancRestApi(ServerContext& context) :
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	2037 context_(context)
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2038 {
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	2039 Register("/", ServeRoot);
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2040 Register("/system", GetSystemInformation);
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	2041 Register("/statistics", GetStatistics);
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2042 Register("/changes", GetChanges);
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	2043 Register("/changes", DeleteChanges);
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	2044 Register("/exports", GetExports);
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	2045 Register("/exports", DeleteExports);
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	2046
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	2047 Register("/instances", UploadDicomFile);
211 b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	2048 Register("/instances", ListResources<ResourceType_Instance>);
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	2049 Register("/patients", ListResources<ResourceType_Patient>);
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	2050 Register("/series", ListResources<ResourceType_Series>);
b7aea293b965 list of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	2051 Register("/studies", ListResources<ResourceType_Study>);
212 f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	2052
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	2053 Register("/instances/{id}", DeleteSingleResource<ResourceType_Instance>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	2054 Register("/instances/{id}", GetSingleResource<ResourceType_Instance>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	2055 Register("/patients/{id}", DeleteSingleResource<ResourceType_Patient>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	2056 Register("/patients/{id}", GetSingleResource<ResourceType_Patient>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	2057 Register("/series/{id}", DeleteSingleResource<ResourceType_Series>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	2058 Register("/series/{id}", GetSingleResource<ResourceType_Series>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	2059 Register("/studies/{id}", DeleteSingleResource<ResourceType_Study>);
f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 211 diff changeset	2060 Register("/studies/{id}", GetSingleResource<ResourceType_Study>);
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	2061
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	2062 Register("/patients/{id}/archive", GetArchive<ResourceType_Patient>);
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	2063 Register("/studies/{id}/archive", GetArchive<ResourceType_Study>);
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	2064 Register("/series/{id}/archive", GetArchive<ResourceType_Series>);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	2065
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2066 Register("/instances/{id}/statistics", GetResourceStatistics);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2067 Register("/patients/{id}/statistics", GetResourceStatistics);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2068 Register("/studies/{id}/statistics", GetResourceStatistics);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2069 Register("/series/{id}/statistics", GetResourceStatistics);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	2070
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	2071 Register("/patients/{id}/protected", IsProtectedPatient);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 253 diff changeset	2072 Register("/patients/{id}/protected", SetPatientProtection);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	2073 Register("/instances/{id}/file", GetInstanceFile);
483 8c3573d28868 export dicom instances to the filesystem Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	2074 Register("/instances/{id}/export", ExportInstanceFile);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	2075 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	2076 Register("/instances/{id}/simplified-tags", GetInstanceTags<true>);
214 03817919169b list of frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	2077 Register("/instances/{id}/frames", ListFrames);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	2078 Register("/instances/{id}/content/*", GetRawContent);
213 4ce7fdcc8879 access to tags, simplified-tags and file of an instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 212 diff changeset	2079
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	2080 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	2081 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	2082 Register("/instances/{id}/frames/{frame}/image-uint16", GetImage<ImageExtractionMode_UInt16>);
465 7a966b440f19 signed images to PNG Sebastien Jodogne <s.jodogne@gmail.com> parents: 463 diff changeset	2083 Register("/instances/{id}/frames/{frame}/image-int16", GetImage<ImageExtractionMode_Int16>);
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	2084 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	2085 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	2086 Register("/instances/{id}/image-uint16", GetImage<ImageExtractionMode_UInt16>);
465 7a966b440f19 signed images to PNG Sebastien Jodogne <s.jodogne@gmail.com> parents: 463 diff changeset	2087 Register("/instances/{id}/image-int16", GetImage<ImageExtractionMode_Int16>);
215 c07170f3f4f7 refactoring of access to images in REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	2088
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	2089 Register("/modalities", ListModalities);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	2090 Register("/modalities/{id}", ListModalityOperations);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	2091 Register("/modalities/{id}/find-patient", DicomFindPatient);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	2092 Register("/modalities/{id}/find-study", DicomFindStudy);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	2093 Register("/modalities/{id}/find-series", DicomFindSeries);
499 7db04aa5104f instance-level find scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 485 diff changeset	2094 Register("/modalities/{id}/find-instance", DicomFindInstance);
227 209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	2095 Register("/modalities/{id}/find", DicomFind);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	2096 Register("/modalities/{id}/store", DicomStore);
209ca3f6db62 dicom-scu from rest Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	2097
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	2098 Register("/peers", ListPeers);
b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	2099 Register("/peers/{id}", ListPeerOperations);
485 bdbde1fbfab3 send resources through HTTP Sebastien Jodogne <s.jodogne@gmail.com> parents: 484 diff changeset	2100 Register("/peers/{id}/store", PeerStore);
484 b8ace6fc1d1f preparation for handling Orthanc peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 483 diff changeset	2101
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	2102 Register("/instances/{id}/modify", ModifyInstance);
308 fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	2103 Register("/series/{id}/modify", ModifySeriesInplace);
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 diff changeset	2104 Register("/studies/{id}/modify", ModifyStudyInplace);
515 a8be42bcf2bb Link from modified to original resource in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	2105 //Register("/patients/{id}/modify", ModifyPatientInplace);
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	2106
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	2107 Register("/instances/{id}/anonymize", AnonymizeInstance);
316 d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	2108 Register("/series/{id}/anonymize", AnonymizeSeriesInplace);
d526ac73c886 anonymization of studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	2109 Register("/studies/{id}/anonymize", AnonymizeStudyInplace);
351 64625960af22 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	2110 Register("/patients/{id}/anonymize", AnonymizePatientInplace);
342 a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	2111
a58a8be26aff generation of random uid in the rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	2112 Register("/tools/generate-uid", GenerateUid);
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	2113 Register("/tools/execute-script", ExecuteScript);
446 b7ef1a7d857e /tools/now Sebastien Jodogne <s.jodogne@gmail.com> parents: 443 diff changeset	2114 Register("/tools/now", GetNowIsoString);
701 f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2115
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2116 Register("/{resourceType}/{id}/metadata", ListMetadata);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2117 Register("/{resourceType}/{id}/metadata/{name}", DeleteMetadata);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2118 Register("/{resourceType}/{id}/metadata/{name}", GetMetadata);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2119 Register("/{resourceType}/{id}/metadata/{name}", SetMetadata);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2120
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2121 Register("/{resourceType}/{id}/attachments", ListAttachments);
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	2122 Register("/{resourceType}/{id}/attachments/{name}", DeleteAttachment);
701 f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2123 Register("/{resourceType}/{id}/attachments/{name}", GetAttachmentOperations);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2124 Register("/{resourceType}/{id}/attachments/{name}/compressed-data", GetAttachmentData<0>);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2125 Register("/{resourceType}/{id}/attachments/{name}/compressed-md5", GetAttachmentCompressedMD5);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2126 Register("/{resourceType}/{id}/attachments/{name}/compressed-size", GetAttachmentCompressedSize);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2127 Register("/{resourceType}/{id}/attachments/{name}/data", GetAttachmentData<1>);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2128 Register("/{resourceType}/{id}/attachments/{name}/md5", GetAttachmentMD5);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2129 Register("/{resourceType}/{id}/attachments/{name}/size", GetAttachmentSize);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2130 Register("/{resourceType}/{id}/attachments/{name}/verify-md5", VerifyAttachment);
f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	2131 Register("/{resourceType}/{id}/attachments/{name}", UploadAttachment);
210 96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2132 }
96b7918a6a18 start of the refactoring of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2133 }

Mercurial > hg > orthanc

annotate OrthancServer/OrthancRestApi/OrthancRestApi.cpp @ 750:4afad8cb94fd