annotate OrthancServer/OrthancRestApi.cpp @ 2750:4c271054e044 Orthanc-0.7.3

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