Mercurial > hg > orthanc
annotate OrthancServer/ServerContext.cpp @ 320:1b0ffed55ab0
fix download dicom
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 03 Jan 2013 14:41:12 +0100 |
| parents | 4eea080e6e7a |
| children | 2cef9c2d4148 |
| rev | line source |
|---|---|
| 224 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012 Medical Physics Department, CHU of Liege, | |
| 4 * Belgium | |
| 5 * | |
| 6 * This program is free software: you can redistribute it and/or | |
| 7 * modify it under the terms of the GNU General Public License as | |
| 8 * published by the Free Software Foundation, either version 3 of the | |
| 9 * License, or (at your option) any later version. | |
| 10 * | |
| 11 * In addition, as a special exception, the copyright holders of this | |
| 12 * program give permission to link the code of its release with the | |
| 13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 14 * that use the same license as the "OpenSSL" library), and distribute | |
| 15 * the linked executables. You must obey the GNU General Public License | |
| 16 * in all respects for all of the code used other than "OpenSSL". If you | |
| 17 * modify file(s) with this exception, you may extend this exception to | |
| 18 * your version of the file(s), but you are not obligated to do so. If | |
| 19 * you do not wish to do so, delete this exception statement from your | |
| 20 * version. If you delete this exception statement from all source files | |
| 21 * in the program, then also delete it here. | |
| 22 * | |
| 23 * This program is distributed in the hope that it will be useful, but | |
| 24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 26 * General Public License for more details. | |
| 27 * | |
| 28 * You should have received a copy of the GNU General Public License | |
| 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 30 **/ | |
| 31 | |
| 32 | |
| 33 #include "ServerContext.h" | |
| 34 | |
|
226
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
35 #include "../Core/HttpServer/FilesystemHttpSender.h" |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
36 |
| 224 | 37 #include <glog/logging.h> |
| 38 | |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
39 #define ENABLE_DICOM_CACHE 1 |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
40 |
|
227
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
41 |
|
285
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
42 static const size_t DICOM_CACHE_SIZE = 2; |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
43 |
|
227
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
44 /** |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
45 * IMPORTANT: We make the assumption that the same instance of |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
46 * FileStorage can be accessed from multiple threads. This seems OK |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
47 * since the filesystem implements the required locking mechanisms, |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
48 * but maybe a read-writer lock on the "FileStorage" could be |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
49 * useful. Conversely, "ServerIndex" already implements mutex-based |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
50 * locking. |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
51 **/ |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
52 |
| 224 | 53 namespace Orthanc |
| 54 { | |
| 55 ServerContext::ServerContext(const boost::filesystem::path& path) : | |
| 56 storage_(path.string()), | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
57 index_(*this, path.string()), |
|
285
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
58 accessor_(storage_), |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
59 provider_(*this), |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
60 dicomCache_(provider_, DICOM_CACHE_SIZE) |
| 224 | 61 { |
| 62 } | |
| 63 | |
| 236 | 64 void ServerContext::SetCompressionEnabled(bool enabled) |
| 65 { | |
| 66 if (enabled) | |
| 67 LOG(WARNING) << "Disk compression is enabled"; | |
| 68 else | |
| 69 LOG(WARNING) << "Disk compression is disabled"; | |
| 70 | |
| 71 compressionEnabled_ = enabled; | |
| 72 } | |
| 73 | |
|
227
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
74 void ServerContext::RemoveFile(const std::string& fileUuid) |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
75 { |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
76 storage_.Remove(fileUuid); |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
77 } |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
78 |
| 304 | 79 StoreStatus ServerContext::Store(const char* dicomInstance, |
| 224 | 80 size_t dicomSize, |
| 81 const DicomMap& dicomSummary, | |
| 82 const Json::Value& dicomJson, | |
| 83 const std::string& remoteAet) | |
| 84 { | |
| 236 | 85 if (compressionEnabled_) |
| 86 { | |
| 87 accessor_.SetCompressionForNextOperations(CompressionType_Zlib); | |
| 88 } | |
| 89 else | |
| 90 { | |
| 91 accessor_.SetCompressionForNextOperations(CompressionType_None); | |
| 92 } | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
93 |
| 304 | 94 FileInfo dicomInfo = accessor_.Write(dicomInstance, dicomSize, FileContentType_Dicom); |
| 233 | 95 FileInfo jsonInfo = accessor_.Write(dicomJson.toStyledString(), FileContentType_Json); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
96 |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
97 ServerIndex::Attachments attachments; |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
98 attachments.push_back(dicomInfo); |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
99 attachments.push_back(jsonInfo); |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
100 |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
101 StoreStatus status = index_.Store(dicomSummary, attachments, remoteAet); |
| 224 | 102 |
| 103 if (status != StoreStatus_Success) | |
| 104 { | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
105 storage_.Remove(dicomInfo.GetUuid()); |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
106 storage_.Remove(jsonInfo.GetUuid()); |
| 224 | 107 } |
| 108 | |
| 109 switch (status) | |
| 110 { | |
| 111 case StoreStatus_Success: | |
| 112 LOG(INFO) << "New instance stored"; | |
| 113 break; | |
| 114 | |
| 115 case StoreStatus_AlreadyStored: | |
| 116 LOG(INFO) << "Already stored"; | |
| 117 break; | |
| 118 | |
| 119 case StoreStatus_Failure: | |
| 120 LOG(ERROR) << "Store failure"; | |
| 121 break; | |
| 122 } | |
| 123 | |
| 124 return status; | |
| 125 } | |
|
226
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
126 |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
127 |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
128 void ServerContext::AnswerFile(RestApiOutput& output, |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
129 const std::string& instancePublicId, |
| 233 | 130 FileContentType content) |
|
226
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
131 { |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
132 FileInfo attachment; |
| 236 | 133 if (!index_.LookupAttachment(attachment, instancePublicId, content)) |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
134 { |
| 236 | 135 throw OrthancException(ErrorCode_InternalError); |
| 136 } | |
|
226
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
137 |
| 236 | 138 accessor_.SetCompressionForNextOperations(attachment.GetCompressionType()); |
| 320 | 139 |
| 236 | 140 std::auto_ptr<HttpFileSender> sender(accessor_.ConstructHttpFileSender(attachment.GetUuid())); |
| 320 | 141 sender->SetContentType("application/dicom"); |
| 142 sender->SetDownloadFilename(instancePublicId + ".dcm"); | |
| 236 | 143 output.AnswerFile(*sender); |
|
226
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
144 } |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
145 |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
146 |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
147 void ServerContext::ReadJson(Json::Value& result, |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
148 const std::string& instancePublicId) |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
149 { |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
150 std::string s; |
| 233 | 151 ReadFile(s, instancePublicId, FileContentType_Json); |
|
226
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
152 |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
153 Json::Reader reader; |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
154 if (!reader.parse(s, result)) |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
155 { |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
156 throw OrthancException("Corrupted JSON file"); |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
157 } |
|
8a26a8e85edf
refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
224
diff
changeset
|
158 } |
|
227
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
159 |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
160 |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
161 void ServerContext::ReadFile(std::string& result, |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
162 const std::string& instancePublicId, |
| 233 | 163 FileContentType content) |
|
227
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
164 { |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
165 FileInfo attachment; |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
166 if (!index_.LookupAttachment(attachment, instancePublicId, content)) |
|
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 throw OrthancException(ErrorCode_InternalError); |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
169 } |
|
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
170 |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
171 accessor_.SetCompressionForNextOperations(attachment.GetCompressionType()); |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
172 accessor_.Read(result, attachment.GetUuid()); |
|
227
209ca3f6db62
dicom-scu from rest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
173 } |
|
285
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
174 |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
175 |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
176 IDynamicObject* ServerContext::DicomCacheProvider::Provide(const std::string& instancePublicId) |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
177 { |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
178 std::string content; |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
179 context_.ReadFile(content, instancePublicId, FileContentType_Dicom); |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
180 return new ParsedDicomFile(content); |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
181 } |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
182 |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
183 |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
184 ParsedDicomFile& ServerContext::GetDicomFile(const std::string& instancePublicId) |
|
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
185 { |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
186 #if ENABLE_DICOM_CACHE == 0 |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
187 static std::auto_ptr<IDynamicObject> p; |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
188 p.reset(provider_.Provide(instancePublicId)); |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
189 return dynamic_cast<ParsedDicomFile&>(*p); |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
190 #else |
|
285
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
191 return dynamic_cast<ParsedDicomFile&>(dicomCache_.Access(instancePublicId)); |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
192 #endif |
|
285
4031f73fe0e4
access to the raw dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
193 } |
| 304 | 194 |
| 195 | |
| 196 StoreStatus ServerContext::Store(std::string& resultPublicId, | |
| 197 DcmFileFormat& dicomInstance, | |
| 198 const char* dicomBuffer, | |
| 199 size_t dicomSize) | |
| 200 { | |
| 201 DicomMap dicomSummary; | |
| 202 FromDcmtkBridge::Convert(dicomSummary, *dicomInstance.getDataset()); | |
| 203 | |
| 204 DicomInstanceHasher hasher(dicomSummary); | |
| 205 resultPublicId = hasher.HashInstance(); | |
| 206 | |
| 207 Json::Value dicomJson; | |
| 208 FromDcmtkBridge::ToJson(dicomJson, *dicomInstance.getDataset()); | |
| 209 | |
| 210 StoreStatus status = StoreStatus_Failure; | |
| 211 if (dicomSize > 0) | |
| 212 { | |
| 213 status = Store(dicomBuffer, dicomSize, dicomSummary, dicomJson, ""); | |
| 214 } | |
| 215 | |
| 216 return status; | |
| 217 } | |
| 218 | |
| 219 | |
| 220 StoreStatus ServerContext::Store(std::string& resultPublicId, | |
| 221 DcmFileFormat& dicomInstance) | |
| 222 { | |
| 223 std::string buffer; | |
| 224 if (!FromDcmtkBridge::SaveToMemoryBuffer(buffer, dicomInstance.getDataset())) | |
| 225 { | |
| 226 throw OrthancException(ErrorCode_InternalError); | |
| 227 } | |
| 228 | |
| 229 if (buffer.size() == 0) | |
| 230 return Store(resultPublicId, dicomInstance, NULL, 0); | |
| 231 else | |
| 232 return Store(resultPublicId, dicomInstance, &buffer[0], buffer.size()); | |
| 233 } | |
| 234 | |
| 235 | |
| 236 StoreStatus ServerContext::Store(std::string& resultPublicId, | |
| 237 const char* dicomBuffer, | |
| 238 size_t dicomSize) | |
| 239 { | |
| 240 ParsedDicomFile dicom(dicomBuffer, dicomSize); | |
| 241 return Store(resultPublicId, dicom.GetDicom(), dicomBuffer, dicomSize); | |
| 242 } | |
| 243 | |
| 224 | 244 } |