Mercurial > hg > orthanc-stone
annotate Framework/Oracle/GenericOracleRunner.cpp @ 1138:1a73f852810a broker
integration mainline->broker
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 07 Nov 2019 07:28:39 +0100 |
parents | cc029987b6dc |
children | 6333e6f7248e |
rev | line source |
---|---|
1077 | 1 /** |
2 * Stone of Orthanc | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium | |
6 * | |
7 * This program is free software: you can redistribute it and/or | |
8 * modify it under the terms of the GNU Affero General Public License | |
9 * as published by the Free Software Foundation, either version 3 of | |
10 * the License, or (at your option) any later version. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Affero General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Affero General Public License | |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
19 **/ | |
20 | |
21 | |
22 #include "GenericOracleRunner.h" | |
23 | |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
24 #if !defined(ORTHANC_ENABLE_DCMTK) |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
25 # error The macro ORTHANC_ENABLE_DCMTK must be defined |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
26 #endif |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
27 |
1077 | 28 #include "GetOrthancImageCommand.h" |
29 #include "GetOrthancWebViewerJpegCommand.h" | |
30 #include "HttpCommand.h" | |
31 #include "OracleCommandExceptionMessage.h" | |
32 #include "OrthancRestApiCommand.h" | |
1104 | 33 #include "ReadFileCommand.h" |
1077 | 34 |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
35 #if ORTHANC_ENABLE_DCMTK == 1 |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
36 # include "ParseDicomFileCommand.h" |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
37 # include <dcmtk/dcmdata/dcdeftag.h> |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
38 #endif |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
39 |
1077 | 40 #include <Core/Compression/GzipCompressor.h> |
41 #include <Core/HttpClient.h> | |
42 #include <Core/OrthancException.h> | |
43 #include <Core/Toolbox.h> | |
1104 | 44 #include <Core/SystemToolbox.h> |
45 | |
46 #include <boost/filesystem.hpp> | |
1077 | 47 |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
48 |
1077 | 49 namespace OrthancStone |
50 { | |
51 static void CopyHttpHeaders(Orthanc::HttpClient& client, | |
52 const Orthanc::HttpClient::HttpHeaders& headers) | |
53 { | |
54 for (Orthanc::HttpClient::HttpHeaders::const_iterator | |
55 it = headers.begin(); it != headers.end(); it++ ) | |
56 { | |
57 client.AddHeader(it->first, it->second); | |
58 } | |
59 } | |
60 | |
61 | |
62 static void DecodeAnswer(std::string& answer, | |
63 const Orthanc::HttpClient::HttpHeaders& headers) | |
64 { | |
65 Orthanc::HttpCompression contentEncoding = Orthanc::HttpCompression_None; | |
66 | |
67 for (Orthanc::HttpClient::HttpHeaders::const_iterator it = headers.begin(); | |
68 it != headers.end(); ++it) | |
69 { | |
70 std::string s; | |
71 Orthanc::Toolbox::ToLowerCase(s, it->first); | |
72 | |
73 if (s == "content-encoding") | |
74 { | |
75 if (it->second == "gzip") | |
76 { | |
77 contentEncoding = Orthanc::HttpCompression_Gzip; | |
78 } | |
79 else | |
80 { | |
81 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol, | |
82 "Unsupported HTTP Content-Encoding: " + it->second); | |
83 } | |
84 | |
85 break; | |
86 } | |
87 } | |
88 | |
89 if (contentEncoding == Orthanc::HttpCompression_Gzip) | |
90 { | |
91 std::string compressed; | |
92 answer.swap(compressed); | |
93 | |
94 Orthanc::GzipCompressor compressor; | |
95 compressor.Uncompress(answer, compressed.c_str(), compressed.size()); | |
96 | |
97 LOG(INFO) << "Uncompressing gzip Encoding: from " << compressed.size() | |
98 << " to " << answer.size() << " bytes"; | |
99 } | |
100 } | |
101 | |
102 | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
103 static void RunInternal(boost::weak_ptr<IObserver> receiver, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
104 IMessageEmitter& emitter, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
105 const HttpCommand& command) |
1077 | 106 { |
107 Orthanc::HttpClient client; | |
108 client.SetUrl(command.GetUrl()); | |
109 client.SetMethod(command.GetMethod()); | |
110 client.SetTimeout(command.GetTimeout()); | |
111 | |
112 CopyHttpHeaders(client, command.GetHttpHeaders()); | |
113 | |
1079
e6d2ff8f1ab4
credentials in HttpCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1077
diff
changeset
|
114 if (command.HasCredentials()) |
e6d2ff8f1ab4
credentials in HttpCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1077
diff
changeset
|
115 { |
e6d2ff8f1ab4
credentials in HttpCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1077
diff
changeset
|
116 client.SetCredentials(command.GetUsername().c_str(), command.GetPassword().c_str()); |
e6d2ff8f1ab4
credentials in HttpCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1077
diff
changeset
|
117 } |
e6d2ff8f1ab4
credentials in HttpCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1077
diff
changeset
|
118 |
1077 | 119 if (command.GetMethod() == Orthanc::HttpMethod_Post || |
120 command.GetMethod() == Orthanc::HttpMethod_Put) | |
121 { | |
122 client.SetBody(command.GetBody()); | |
123 } | |
124 | |
125 std::string answer; | |
126 Orthanc::HttpClient::HttpHeaders answerHeaders; | |
127 client.ApplyAndThrowException(answer, answerHeaders); | |
128 | |
129 DecodeAnswer(answer, answerHeaders); | |
130 | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
131 HttpCommand::SuccessMessage message(command, answerHeaders, answer); |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
132 emitter.EmitMessage(receiver, message); |
1077 | 133 } |
134 | |
135 | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
136 static void RunInternal(boost::weak_ptr<IObserver> receiver, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
137 IMessageEmitter& emitter, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
138 const Orthanc::WebServiceParameters& orthanc, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
139 const OrthancRestApiCommand& command) |
1077 | 140 { |
141 Orthanc::HttpClient client(orthanc, command.GetUri()); | |
142 client.SetMethod(command.GetMethod()); | |
143 client.SetTimeout(command.GetTimeout()); | |
144 | |
145 CopyHttpHeaders(client, command.GetHttpHeaders()); | |
146 | |
147 if (command.GetMethod() == Orthanc::HttpMethod_Post || | |
148 command.GetMethod() == Orthanc::HttpMethod_Put) | |
149 { | |
150 client.SetBody(command.GetBody()); | |
151 } | |
152 | |
153 std::string answer; | |
154 Orthanc::HttpClient::HttpHeaders answerHeaders; | |
155 client.ApplyAndThrowException(answer, answerHeaders); | |
156 | |
157 DecodeAnswer(answer, answerHeaders); | |
158 | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
159 OrthancRestApiCommand::SuccessMessage message(command, answerHeaders, answer); |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
160 emitter.EmitMessage(receiver, message); |
1077 | 161 } |
162 | |
163 | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
164 static void RunInternal(boost::weak_ptr<IObserver> receiver, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
165 IMessageEmitter& emitter, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
166 const Orthanc::WebServiceParameters& orthanc, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
167 const GetOrthancImageCommand& command) |
1077 | 168 { |
169 Orthanc::HttpClient client(orthanc, command.GetUri()); | |
170 client.SetTimeout(command.GetTimeout()); | |
171 | |
172 CopyHttpHeaders(client, command.GetHttpHeaders()); | |
173 | |
174 std::string answer; | |
175 Orthanc::HttpClient::HttpHeaders answerHeaders; | |
176 client.ApplyAndThrowException(answer, answerHeaders); | |
177 | |
178 DecodeAnswer(answer, answerHeaders); | |
179 | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
180 command.ProcessHttpAnswer(receiver, emitter, answer, answerHeaders); |
1077 | 181 } |
182 | |
183 | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
184 static void RunInternal(boost::weak_ptr<IObserver> receiver, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
185 IMessageEmitter& emitter, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
186 const Orthanc::WebServiceParameters& orthanc, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
187 const GetOrthancWebViewerJpegCommand& command) |
1077 | 188 { |
189 Orthanc::HttpClient client(orthanc, command.GetUri()); | |
190 client.SetTimeout(command.GetTimeout()); | |
191 | |
192 CopyHttpHeaders(client, command.GetHttpHeaders()); | |
193 | |
194 std::string answer; | |
195 Orthanc::HttpClient::HttpHeaders answerHeaders; | |
196 client.ApplyAndThrowException(answer, answerHeaders); | |
197 | |
198 DecodeAnswer(answer, answerHeaders); | |
199 | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
200 command.ProcessHttpAnswer(receiver, emitter, answer); |
1077 | 201 } |
202 | |
203 | |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
204 static std::string GetPath(const std::string& root, |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
205 const std::string& file) |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
206 { |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
207 boost::filesystem::path a(root); |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
208 boost::filesystem::path b(file); |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
209 |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
210 boost::filesystem::path c; |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
211 if (b.is_absolute()) |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
212 { |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
213 c = b; |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
214 } |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
215 else |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
216 { |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
217 c = a / b; |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
218 } |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
219 |
1111
3730956f41a5
ParseDicomFileCommand::GetDicomDirPath()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1110
diff
changeset
|
220 LOG(TRACE) << "Oracle reading file: " << c.string(); |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
221 return c.string(); |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
222 } |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
223 |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
224 |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
225 static void RunInternal(boost::weak_ptr<IObserver> receiver, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
226 IMessageEmitter& emitter, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
227 const std::string& root, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
228 const ReadFileCommand& command) |
1104 | 229 { |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
230 std::string path = GetPath(root, command.GetPath()); |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
231 |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
232 std::string content; |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
233 Orthanc::SystemToolbox::ReadFile(content, path, true /* log */); |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
234 |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
235 ReadFileCommand::SuccessMessage message(command, content); |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
236 emitter.EmitMessage(receiver, message); |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
237 } |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
238 |
1104 | 239 |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
240 #if ORTHANC_ENABLE_DCMTK == 1 |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
241 namespace |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
242 { |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
243 class IDicomHandler : public boost::noncopyable |
1104 | 244 { |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
245 public: |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
246 virtual ~IDicomHandler() |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
247 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
248 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
249 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
250 virtual void Handle(Orthanc::ParsedDicomFile* dicom, |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
251 const ParseDicomFileCommand& command, |
1137
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
252 const std::string& path, |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
253 uint64_t fileSize) = 0; |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
254 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
255 static void Apply(IDicomHandler& handler, |
1137
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
256 const std::string& path, |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
257 const ParseDicomFileCommand& command) |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
258 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
259 if (!Orthanc::SystemToolbox::IsRegularFile(path)) |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
260 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
261 throw Orthanc::OrthancException(Orthanc::ErrorCode_InexistentFile); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
262 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
263 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
264 uint64_t fileSize = Orthanc::SystemToolbox::GetFileSize(path); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
265 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
266 // Check for 32bit systems |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
267 if (fileSize != static_cast<uint64_t>(static_cast<size_t>(fileSize))) |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
268 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
269 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotEnoughMemory); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
270 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
271 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
272 DcmFileFormat dicom; |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
273 bool ok; |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
274 |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
275 if (command.IsPixelDataIncluded()) |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
276 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
277 ok = dicom.loadFile(path.c_str()).good(); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
278 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
279 else |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
280 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
281 #if DCMTK_VERSION_NUMBER >= 362 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
282 // NB : We could stop at (0x3007, 0x0000) instead of |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
283 // DCM_PixelData, cf. the Orthanc::DICOM_TAG_* constants |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
284 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
285 static const DcmTagKey STOP = DCM_PixelData; |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
286 //static const DcmTagKey STOP(0x3007, 0x0000); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
287 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
288 ok = dicom.loadFileUntilTag(path.c_str(), EXS_Unknown, EGL_noChange, |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
289 DCM_MaxReadLength, ERM_autoDetect, STOP).good(); |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
290 #else |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
291 // The primitive "loadFileUntilTag" was introduced in DCMTK 3.6.2 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
292 ok = dicom.loadFile(path.c_str()).good(); |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
293 #endif |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
294 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
295 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
296 printf("Reading %s\n", path.c_str()); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
297 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
298 if (ok) |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
299 { |
1137
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
300 handler.Handle(new Orthanc::ParsedDicomFile(dicom), command, path, fileSize); |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
301 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
302 else |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
303 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
304 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
305 "Cannot parse file: " + path); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
306 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
307 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
308 }; |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
309 |
1104 | 310 |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
311 class DicomHandlerWithoutCache : public IDicomHandler |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
312 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
313 private: |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
314 boost::weak_ptr<IObserver> receiver_; |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
315 IMessageEmitter& emitter_; |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
316 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
317 public: |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
318 DicomHandlerWithoutCache(boost::weak_ptr<IObserver> receiver, |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
319 IMessageEmitter& emitter) : |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
320 receiver_(receiver), |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
321 emitter_(emitter) |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
322 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
323 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
324 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
325 virtual void Handle(Orthanc::ParsedDicomFile* dicom, |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
326 const ParseDicomFileCommand& command, |
1137
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
327 const std::string& path, |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
328 uint64_t fileSize) |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
329 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
330 std::auto_ptr<Orthanc::ParsedDicomFile> parsed(dicom); |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
331 |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
332 ParseDicomFileCommand::SuccessMessage message |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
333 (command, *parsed, static_cast<size_t>(fileSize), command.IsPixelDataIncluded()); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
334 emitter_.EmitMessage(receiver_, message); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
335 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
336 }; |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
337 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
338 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
339 class DicomHandlerWithCache : public IDicomHandler |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
340 { |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
341 private: |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
342 boost::weak_ptr<IObserver> receiver_; |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
343 IMessageEmitter& emitter_; |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
344 boost::shared_ptr<ParsedDicomFileCache> cache_; |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
345 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
346 public: |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
347 DicomHandlerWithCache(boost::weak_ptr<IObserver> receiver, |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
348 IMessageEmitter& emitter, |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
349 boost::shared_ptr<ParsedDicomFileCache> cache) : |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
350 receiver_(receiver), |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
351 emitter_(emitter), |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
352 cache_(cache) |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
353 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
354 if (!cache) |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
355 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
356 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
357 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
358 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
359 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
360 virtual void Handle(Orthanc::ParsedDicomFile* dicom, |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
361 const ParseDicomFileCommand& command, |
1137
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
362 const std::string& path, |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
363 uint64_t fileSize) |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
364 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
365 std::auto_ptr<Orthanc::ParsedDicomFile> parsed(dicom); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
366 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
367 { |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
368 ParseDicomFileCommand::SuccessMessage message |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
369 (command, *parsed, static_cast<size_t>(fileSize), command.IsPixelDataIncluded()); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
370 emitter_.EmitMessage(receiver_, message); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
371 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
372 |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
373 // Store it into the cache for future use |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
374 assert(cache_); |
1137
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
375 cache_->Acquire(path, parsed.release(), |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
376 static_cast<size_t>(fileSize), command.IsPixelDataIncluded()); |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
377 } |
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
378 }; |
1104 | 379 } |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
380 |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
381 |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
382 static void RunInternal(boost::weak_ptr<IObserver> receiver, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
383 IMessageEmitter& emitter, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
384 boost::shared_ptr<ParsedDicomFileCache> cache, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
385 const std::string& root, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
386 const ParseDicomFileCommand& command) |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
387 { |
1137
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
388 const std::string path = GetPath(root, command.GetPath()); |
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
389 |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
390 #if 1 |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
391 if (cache.get()) |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
392 { |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
393 { |
1137
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
394 ParsedDicomFileCache::Reader reader(*cache, path); |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
395 if (reader.IsValid() && |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
396 (!command.IsPixelDataIncluded() || |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
397 reader.HasPixelData())) |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
398 { |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
399 // Reuse the DICOM file from the cache |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
400 ParseDicomFileCommand::SuccessMessage message( |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
401 command, reader.GetDicom(), reader.GetFileSize(), reader.HasPixelData()); |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
402 emitter.EmitMessage(receiver, message); |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
403 return; |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
404 } |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
405 } |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
406 |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
407 DicomHandlerWithCache handler(receiver, emitter, cache); |
1137
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
408 IDicomHandler::Apply(handler, path, command); |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
409 } |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
410 else |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
411 { |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
412 // No cache available |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
413 DicomHandlerWithoutCache handler(receiver, emitter); |
1137
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
414 IDicomHandler::Apply(handler, path, command); |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
415 } |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
416 #else |
1136
42581a6182c8
reactivation of the cache of parsed DICOM files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
417 DicomHandlerWithoutCache handler(receiver, emitter); |
1137
cc029987b6dc
improved cache key
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1136
diff
changeset
|
418 IDicomHandler::Apply(handler, path, command); |
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
419 #endif |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
420 } |
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
421 |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
422 #endif |
1104 | 423 |
424 | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
425 void GenericOracleRunner::Run(boost::weak_ptr<IObserver> receiver, |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
426 IMessageEmitter& emitter, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
427 const IOracleCommand& command) |
1077 | 428 { |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
429 Orthanc::ErrorCode error = Orthanc::ErrorCode_Success; |
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
430 |
1077 | 431 try |
432 { | |
433 switch (command.GetType()) | |
434 { | |
435 case IOracleCommand::Type_Sleep: | |
436 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadParameterType, | |
437 "Sleep command cannot be executed by the runner"); | |
438 | |
439 case IOracleCommand::Type_Http: | |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
440 RunInternal(receiver, emitter, dynamic_cast<const HttpCommand&>(command)); |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
441 break; |
1077 | 442 |
443 case IOracleCommand::Type_OrthancRestApi: | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
444 RunInternal(receiver, emitter, orthanc_, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
445 dynamic_cast<const OrthancRestApiCommand&>(command)); |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
446 break; |
1077 | 447 |
448 case IOracleCommand::Type_GetOrthancImage: | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
449 RunInternal(receiver, emitter, orthanc_, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
450 dynamic_cast<const GetOrthancImageCommand&>(command)); |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
451 break; |
1077 | 452 |
453 case IOracleCommand::Type_GetOrthancWebViewerJpeg: | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
454 RunInternal(receiver, emitter, orthanc_, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
455 dynamic_cast<const GetOrthancWebViewerJpegCommand&>(command)); |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
456 break; |
1077 | 457 |
1104 | 458 case IOracleCommand::Type_ReadFile: |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
459 RunInternal(receiver, emitter, rootDirectory_, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
460 dynamic_cast<const ReadFileCommand&>(command)); |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
461 break; |
1104 | 462 |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
463 case IOracleCommand::Type_ParseDicomFile: |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
464 #if ORTHANC_ENABLE_DCMTK == 1 |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
465 RunInternal(receiver, emitter, dicomCache_, rootDirectory_, |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
466 dynamic_cast<const ParseDicomFileCommand&>(command)); |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
467 break; |
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
468 #else |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
469 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
470 "DCMTK must be enabled to parse DICOM files"); |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
471 #endif |
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
472 |
1077 | 473 default: |
474 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
475 } | |
476 } | |
477 catch (Orthanc::OrthancException& e) | |
478 { | |
479 LOG(ERROR) << "Exception within the oracle: " << e.What(); | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
480 error = e.GetErrorCode(); |
1077 | 481 } |
482 catch (...) | |
483 { | |
484 LOG(ERROR) << "Threaded exception within the oracle"; | |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
485 error = Orthanc::ErrorCode_InternalError; |
1077 | 486 } |
1134
87fbeb823375
allocating messages from oracle commands on the stack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1128
diff
changeset
|
487 |
1135
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
488 if (error != Orthanc::ErrorCode_Success) |
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
489 { |
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
490 OracleCommandExceptionMessage message(command, error); |
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
491 emitter.EmitMessage(receiver, message); |
a0a33e5ea5bb
IOracleCommand::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1134
diff
changeset
|
492 } |
1077 | 493 } |
494 } |