Mercurial > hg > orthanc-stone
annotate Framework/Oracle/GenericOracleRunner.cpp @ 1124:a8bf81756839 broker
unsuccessful attempt to cache ParseDicomFileCommand
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 05 Nov 2019 18:49:06 +0100 |
| parents | a08699daf78b |
| children | 8e3763d1736a |
| 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 "CustomOracleCommand.h" |
| 29 #include "GetOrthancImageCommand.h" | |
| 30 #include "GetOrthancWebViewerJpegCommand.h" | |
| 31 #include "HttpCommand.h" | |
| 32 #include "OracleCommandExceptionMessage.h" | |
| 33 #include "OrthancRestApiCommand.h" | |
| 1104 | 34 #include "ReadFileCommand.h" |
| 1077 | 35 |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
36 #if ORTHANC_ENABLE_DCMTK == 1 |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
37 # include "ParseDicomFileCommand.h" |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
38 # include <dcmtk/dcmdata/dcdeftag.h> |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
39 #endif |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
40 |
| 1077 | 41 #include <Core/Compression/GzipCompressor.h> |
| 42 #include <Core/HttpClient.h> | |
| 43 #include <Core/OrthancException.h> | |
| 44 #include <Core/Toolbox.h> | |
| 1104 | 45 #include <Core/SystemToolbox.h> |
| 46 | |
| 47 #include <boost/filesystem.hpp> | |
| 1077 | 48 |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
49 |
| 1077 | 50 namespace OrthancStone |
| 51 { | |
| 52 static void CopyHttpHeaders(Orthanc::HttpClient& client, | |
| 53 const Orthanc::HttpClient::HttpHeaders& headers) | |
| 54 { | |
| 55 for (Orthanc::HttpClient::HttpHeaders::const_iterator | |
| 56 it = headers.begin(); it != headers.end(); it++ ) | |
| 57 { | |
| 58 client.AddHeader(it->first, it->second); | |
| 59 } | |
| 60 } | |
| 61 | |
| 62 | |
| 63 static void DecodeAnswer(std::string& answer, | |
| 64 const Orthanc::HttpClient::HttpHeaders& headers) | |
| 65 { | |
| 66 Orthanc::HttpCompression contentEncoding = Orthanc::HttpCompression_None; | |
| 67 | |
| 68 for (Orthanc::HttpClient::HttpHeaders::const_iterator it = headers.begin(); | |
| 69 it != headers.end(); ++it) | |
| 70 { | |
| 71 std::string s; | |
| 72 Orthanc::Toolbox::ToLowerCase(s, it->first); | |
| 73 | |
| 74 if (s == "content-encoding") | |
| 75 { | |
| 76 if (it->second == "gzip") | |
| 77 { | |
| 78 contentEncoding = Orthanc::HttpCompression_Gzip; | |
| 79 } | |
| 80 else | |
| 81 { | |
| 82 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol, | |
| 83 "Unsupported HTTP Content-Encoding: " + it->second); | |
| 84 } | |
| 85 | |
| 86 break; | |
| 87 } | |
| 88 } | |
| 89 | |
| 90 if (contentEncoding == Orthanc::HttpCompression_Gzip) | |
| 91 { | |
| 92 std::string compressed; | |
| 93 answer.swap(compressed); | |
| 94 | |
| 95 Orthanc::GzipCompressor compressor; | |
| 96 compressor.Uncompress(answer, compressed.c_str(), compressed.size()); | |
| 97 | |
| 98 LOG(INFO) << "Uncompressing gzip Encoding: from " << compressed.size() | |
| 99 << " to " << answer.size() << " bytes"; | |
| 100 } | |
| 101 } | |
| 102 | |
| 103 | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
104 static IMessage* Execute(const HttpCommand& command) |
| 1077 | 105 { |
| 106 Orthanc::HttpClient client; | |
| 107 client.SetUrl(command.GetUrl()); | |
| 108 client.SetMethod(command.GetMethod()); | |
| 109 client.SetTimeout(command.GetTimeout()); | |
| 110 | |
| 111 CopyHttpHeaders(client, command.GetHttpHeaders()); | |
| 112 | |
|
1079
e6d2ff8f1ab4
credentials in HttpCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1077
diff
changeset
|
113 if (command.HasCredentials()) |
|
e6d2ff8f1ab4
credentials in HttpCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1077
diff
changeset
|
114 { |
|
e6d2ff8f1ab4
credentials in HttpCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1077
diff
changeset
|
115 client.SetCredentials(command.GetUsername().c_str(), command.GetPassword().c_str()); |
|
e6d2ff8f1ab4
credentials in HttpCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1077
diff
changeset
|
116 } |
|
e6d2ff8f1ab4
credentials in HttpCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1077
diff
changeset
|
117 |
| 1077 | 118 if (command.GetMethod() == Orthanc::HttpMethod_Post || |
| 119 command.GetMethod() == Orthanc::HttpMethod_Put) | |
| 120 { | |
| 121 client.SetBody(command.GetBody()); | |
| 122 } | |
| 123 | |
| 124 std::string answer; | |
| 125 Orthanc::HttpClient::HttpHeaders answerHeaders; | |
| 126 client.ApplyAndThrowException(answer, answerHeaders); | |
| 127 | |
| 128 DecodeAnswer(answer, answerHeaders); | |
| 129 | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
130 return new HttpCommand::SuccessMessage(command, answerHeaders, answer); |
| 1077 | 131 } |
| 132 | |
| 133 | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
134 static IMessage* Execute(const Orthanc::WebServiceParameters& orthanc, |
|
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
135 const OrthancRestApiCommand& command) |
| 1077 | 136 { |
| 137 Orthanc::HttpClient client(orthanc, command.GetUri()); | |
| 138 client.SetMethod(command.GetMethod()); | |
| 139 client.SetTimeout(command.GetTimeout()); | |
| 140 | |
| 141 CopyHttpHeaders(client, command.GetHttpHeaders()); | |
| 142 | |
| 143 if (command.GetMethod() == Orthanc::HttpMethod_Post || | |
| 144 command.GetMethod() == Orthanc::HttpMethod_Put) | |
| 145 { | |
| 146 client.SetBody(command.GetBody()); | |
| 147 } | |
| 148 | |
| 149 std::string answer; | |
| 150 Orthanc::HttpClient::HttpHeaders answerHeaders; | |
| 151 client.ApplyAndThrowException(answer, answerHeaders); | |
| 152 | |
| 153 DecodeAnswer(answer, answerHeaders); | |
| 154 | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
155 return new OrthancRestApiCommand::SuccessMessage(command, answerHeaders, answer); |
| 1077 | 156 } |
| 157 | |
| 158 | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
159 static IMessage* Execute(const Orthanc::WebServiceParameters& orthanc, |
|
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
160 const GetOrthancImageCommand& command) |
| 1077 | 161 { |
| 162 Orthanc::HttpClient client(orthanc, command.GetUri()); | |
| 163 client.SetTimeout(command.GetTimeout()); | |
| 164 | |
| 165 CopyHttpHeaders(client, command.GetHttpHeaders()); | |
| 166 | |
| 167 std::string answer; | |
| 168 Orthanc::HttpClient::HttpHeaders answerHeaders; | |
| 169 client.ApplyAndThrowException(answer, answerHeaders); | |
| 170 | |
| 171 DecodeAnswer(answer, answerHeaders); | |
| 172 | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
173 return command.ProcessHttpAnswer(answer, answerHeaders); |
| 1077 | 174 } |
| 175 | |
| 176 | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
177 static IMessage* Execute(const Orthanc::WebServiceParameters& orthanc, |
|
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
178 const GetOrthancWebViewerJpegCommand& command) |
| 1077 | 179 { |
| 180 Orthanc::HttpClient client(orthanc, command.GetUri()); | |
| 181 client.SetTimeout(command.GetTimeout()); | |
| 182 | |
| 183 CopyHttpHeaders(client, command.GetHttpHeaders()); | |
| 184 | |
| 185 std::string answer; | |
| 186 Orthanc::HttpClient::HttpHeaders answerHeaders; | |
| 187 client.ApplyAndThrowException(answer, answerHeaders); | |
| 188 | |
| 189 DecodeAnswer(answer, answerHeaders); | |
| 190 | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
191 return command.ProcessHttpAnswer(answer); |
| 1077 | 192 } |
| 193 | |
| 194 | |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
195 static std::string GetPath(const std::string& root, |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
196 const std::string& file) |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
197 { |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
198 boost::filesystem::path a(root); |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
199 boost::filesystem::path b(file); |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
200 |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
201 boost::filesystem::path c; |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
202 if (b.is_absolute()) |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
203 { |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
204 c = b; |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
205 } |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
206 else |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
207 { |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
208 c = a / b; |
|
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 |
|
1111
3730956f41a5
ParseDicomFileCommand::GetDicomDirPath()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1110
diff
changeset
|
211 LOG(TRACE) << "Oracle reading file: " << c.string(); |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
212 return c.string(); |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
213 } |
|
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 |
| 1104 | 216 static IMessage* Execute(const std::string& root, |
| 217 const ReadFileCommand& command) | |
| 218 { | |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
219 std::string path = GetPath(root, command.GetPath()); |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
220 |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
221 std::string content; |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
222 Orthanc::SystemToolbox::ReadFile(content, path, true /* log */); |
|
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 return new ReadFileCommand::SuccessMessage(command, content); |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
225 } |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
226 |
| 1104 | 227 |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
228 #if ORTHANC_ENABLE_DCMTK == 1 |
|
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
229 static ParseDicomFileCommand::SuccessMessage* Execute(const std::string& root, |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
230 const ParseDicomFileCommand& command) |
|
1110
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 path = GetPath(root, command.GetPath()); |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
233 |
|
1116
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
234 if (!Orthanc::SystemToolbox::IsRegularFile(path)) |
|
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
235 { |
|
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
236 throw Orthanc::OrthancException(Orthanc::ErrorCode_InexistentFile); |
|
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
237 } |
|
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
238 |
|
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
239 uint64_t fileSize = Orthanc::SystemToolbox::GetFileSize(path); |
|
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
240 |
|
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
241 // Check for 32bit systems |
|
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
242 if (fileSize != static_cast<uint64_t>(static_cast<size_t>(fileSize))) |
|
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
243 { |
|
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
244 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotEnoughMemory); |
|
a08699daf78b
ParsedDicomFileCache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1111
diff
changeset
|
245 } |
|
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
246 |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
247 DcmFileFormat dicom; |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
248 bool ok; |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
249 |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
250 if (command.IsPixelDataIncluded()) |
| 1104 | 251 { |
|
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
252 ok = dicom.loadFile(path.c_str()).good(); |
| 1104 | 253 } |
| 254 else | |
| 255 { | |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
256 #if DCMTK_VERSION_NUMBER >= 362 |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
257 // NB : We could stop at (0x3007, 0x0000) instead of |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
258 // DCM_PixelData, cf. the Orthanc::DICOM_TAG_* constants |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
259 |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
260 static const DcmTagKey STOP = DCM_PixelData; |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
261 //static const DcmTagKey STOP(0x3007, 0x0000); |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
262 |
|
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
263 ok = dicom.loadFileUntilTag(path.c_str(), EXS_Unknown, EGL_noChange, |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
264 DCM_MaxReadLength, ERM_autoDetect, STOP).good(); |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
265 #else |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
266 // The primitive "loadFileUntilTag" was introduced in DCMTK 3.6.2 |
|
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
267 ok = dicom.loadFile(path.c_str()).good(); |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
268 #endif |
| 1104 | 269 } |
| 270 | |
|
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
271 printf("Reading %s\n", path.c_str()); |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
272 |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
273 if (ok) |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
274 { |
|
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
275 return new ParseDicomFileCommand::SuccessMessage |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
276 (command, dicom, static_cast<size_t>(fileSize), command.IsPixelDataIncluded()); |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
277 } |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
278 else |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
279 { |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
280 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
281 "Cannot parse file: " + path); |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
282 } |
| 1104 | 283 } |
|
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
284 |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
285 |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
286 static ParseDicomFileCommand::SuccessMessage* Execute(boost::shared_ptr<ParsedDicomFileCache> cache, |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
287 const std::string& root, |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
288 const ParseDicomFileCommand& command) |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
289 { |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
290 #if 0 |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
291 // The code to use the cache is buggy in multithreaded environments => TODO FIX |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
292 if (cache.get()) |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
293 { |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
294 { |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
295 ParsedDicomFileCache::Reader reader(*cache, command.GetPath()); |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
296 if (reader.IsValid() && |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
297 (!command.IsPixelDataIncluded() || |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
298 reader.HasPixelData())) |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
299 { |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
300 // Reuse the DICOM file from the cache |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
301 return new ParseDicomFileCommand::SuccessMessage( |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
302 command, reader.GetDicom(), reader.GetFileSize(), reader.HasPixelData()); |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
303 } |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
304 } |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
305 |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
306 // Not in the cache, first read and parse the DICOM file |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
307 std::auto_ptr<ParseDicomFileCommand::SuccessMessage> message(Execute(root, command)); |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
308 |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
309 // Secondly, store it into the cache for future use |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
310 assert(&message->GetOrigin() == &command); |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
311 cache->Acquire(message->GetOrigin().GetPath(), message->GetDicom(), |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
312 message->GetFileSize(), message->HasPixelData()); |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
313 |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
314 return message.release(); |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
315 } |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
316 else |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
317 { |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
318 // No cache available |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
319 return Execute(root, command); |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
320 } |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
321 #else |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
322 return Execute(root, command); |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
323 #endif |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
324 } |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
325 |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
326 #endif |
| 1104 | 327 |
| 328 | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
329 IMessage* GenericOracleRunner::Run(IOracleCommand& command) |
| 1077 | 330 { |
| 331 try | |
| 332 { | |
| 333 switch (command.GetType()) | |
| 334 { | |
| 335 case IOracleCommand::Type_Sleep: | |
| 336 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadParameterType, | |
| 337 "Sleep command cannot be executed by the runner"); | |
| 338 | |
| 339 case IOracleCommand::Type_Http: | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
340 return Execute(dynamic_cast<const HttpCommand&>(command)); |
| 1077 | 341 |
| 342 case IOracleCommand::Type_OrthancRestApi: | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
343 return Execute(orthanc_, dynamic_cast<const OrthancRestApiCommand&>(command)); |
| 1077 | 344 |
| 345 case IOracleCommand::Type_GetOrthancImage: | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
346 return Execute(orthanc_, dynamic_cast<const GetOrthancImageCommand&>(command)); |
| 1077 | 347 |
| 348 case IOracleCommand::Type_GetOrthancWebViewerJpeg: | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
349 return Execute(orthanc_, dynamic_cast<const GetOrthancWebViewerJpegCommand&>(command)); |
| 1077 | 350 |
| 351 case IOracleCommand::Type_Custom: | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
352 return dynamic_cast<CustomOracleCommand&>(command).Execute(*this); |
| 1077 | 353 |
| 1104 | 354 case IOracleCommand::Type_ReadFile: |
| 355 return Execute(rootDirectory_, dynamic_cast<const ReadFileCommand&>(command)); | |
| 356 | |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
357 case IOracleCommand::Type_ParseDicomFile: |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
358 #if ORTHANC_ENABLE_DCMTK == 1 |
|
1124
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
359 return Execute(dicomCache_, rootDirectory_, |
|
a8bf81756839
unsuccessful attempt to cache ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1116
diff
changeset
|
360 dynamic_cast<const ParseDicomFileCommand&>(command)); |
|
1110
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
361 #else |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
362 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
363 "DCMTK must be enabled to parse DICOM files"); |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
364 #endif |
|
b82b74d13830
ParseDicomFileCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1104
diff
changeset
|
365 |
| 1077 | 366 default: |
| 367 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
| 368 } | |
| 369 } | |
| 370 catch (Orthanc::OrthancException& e) | |
| 371 { | |
| 372 LOG(ERROR) << "Exception within the oracle: " << e.What(); | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
373 return new OracleCommandExceptionMessage(command, e); |
| 1077 | 374 } |
| 375 catch (...) | |
| 376 { | |
| 377 LOG(ERROR) << "Threaded exception within the oracle"; | |
|
1098
17660df24c36
simplification of IOracleRunner
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1079
diff
changeset
|
378 return new OracleCommandExceptionMessage(command, Orthanc::ErrorCode_InternalError); |
| 1077 | 379 } |
| 380 } | |
| 381 } |