Mercurial > hg > orthanc
annotate OrthancServer/DicomProtocol/DicomFindAnswers.cpp @ 2202:9b373b7d6713
Fix handling of encodings in C-FIND requests
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 08 Dec 2016 12:45:06 +0100 |
| parents | 9329ba17a069 |
| children | 6dc3bdb4088b |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 62 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
| 0 | 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. | |
| 136 | 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. | |
| 0 | 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 | |
|
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
33 #include "../PrecompiledHeadersServer.h" |
| 0 | 34 #include "DicomFindAnswers.h" |
| 35 | |
| 36 #include "../FromDcmtkBridge.h" | |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
37 #include "../ToDcmtkBridge.h" |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
38 #include "../../Core/OrthancException.h" |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
39 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
40 #include <memory> |
| 1789 | 41 #include <dcmtk/dcmdata/dcfilefo.h> |
| 1847 | 42 #include <boost/noncopyable.hpp> |
| 1789 | 43 |
| 0 | 44 |
| 62 | 45 namespace Orthanc |
| 0 | 46 { |
| 1847 | 47 class DicomFindAnswers::Answer : public boost::noncopyable |
| 1789 | 48 { |
| 49 private: | |
| 50 ParsedDicomFile* dicom_; | |
| 51 DicomMap* map_; | |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
52 |
| 2059 | 53 void CleanupDicom(bool isWorklist) |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
54 { |
| 2059 | 55 if (isWorklist && |
| 56 dicom_ != NULL) | |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
57 { |
| 2059 | 58 // These lines are necessary when serving worklists, otherwise |
| 59 // Orthanc does not behave as "wlmscpfs" | |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
60 dicom_->Remove(DICOM_TAG_MEDIA_STORAGE_SOP_INSTANCE_UID); |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
61 dicom_->Remove(DICOM_TAG_SOP_INSTANCE_UID); |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
62 } |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
63 } |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
64 |
| 1789 | 65 public: |
| 2059 | 66 Answer(bool isWorklist, |
| 67 ParsedDicomFile& dicom) : | |
| 1789 | 68 dicom_(dicom.Clone()), |
| 69 map_(NULL) | |
| 70 { | |
| 2059 | 71 CleanupDicom(isWorklist); |
| 1789 | 72 } |
| 73 | |
| 2059 | 74 Answer(bool isWorklist, |
| 75 const void* dicom, | |
| 1789 | 76 size_t size) : |
| 77 dicom_(new ParsedDicomFile(dicom, size)), | |
| 78 map_(NULL) | |
| 79 { | |
| 2059 | 80 CleanupDicom(isWorklist); |
| 1789 | 81 } |
| 82 | |
| 83 Answer(const DicomMap& map) : | |
| 84 dicom_(NULL), | |
| 85 map_(map.Clone()) | |
| 86 { | |
| 87 } | |
| 88 | |
| 89 ~Answer() | |
| 90 { | |
| 91 if (dicom_ != NULL) | |
| 92 { | |
| 93 delete dicom_; | |
| 94 } | |
| 95 | |
| 96 if (map_ != NULL) | |
| 97 { | |
| 98 delete map_; | |
| 99 } | |
| 100 } | |
| 101 | |
| 102 ParsedDicomFile& GetDicomFile() | |
| 103 { | |
| 104 if (dicom_ == NULL) | |
| 105 { | |
| 106 assert(map_ != NULL); | |
| 107 dicom_ = new ParsedDicomFile(*map_); | |
| 108 } | |
| 109 | |
| 110 return *dicom_; | |
| 111 } | |
| 112 }; | |
| 113 | |
| 114 | |
| 2059 | 115 void DicomFindAnswers::SetWorklist(bool isWorklist) |
| 116 { | |
| 117 if (answers_.empty()) | |
| 118 { | |
| 119 isWorklist_ = isWorklist; | |
| 120 } | |
| 121 else | |
| 122 { | |
| 123 // This set of answers is not empty anymore, cannot change its type | |
| 124 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 125 } | |
| 126 } | |
| 127 | |
| 128 | |
| 0 | 129 void DicomFindAnswers::Clear() |
| 130 { | |
| 1789 | 131 for (size_t i = 0; i < answers_.size(); i++) |
| 0 | 132 { |
| 1789 | 133 assert(answers_[i] != NULL); |
| 134 delete answers_[i]; | |
| 0 | 135 } |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
136 |
| 1789 | 137 answers_.clear(); |
| 0 | 138 } |
| 139 | |
| 1789 | 140 |
| 0 | 141 void DicomFindAnswers::Reserve(size_t size) |
| 142 { | |
| 1789 | 143 if (size > answers_.size()) |
| 0 | 144 { |
| 1789 | 145 answers_.reserve(size); |
| 0 | 146 } |
| 147 } | |
| 148 | |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
149 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
150 void DicomFindAnswers::Add(const DicomMap& map) |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
151 { |
| 1789 | 152 answers_.push_back(new Answer(map)); |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
153 } |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
154 |
| 1789 | 155 |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
156 void DicomFindAnswers::Add(ParsedDicomFile& dicom) |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
157 { |
| 2059 | 158 answers_.push_back(new Answer(isWorklist_, dicom)); |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
159 } |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
160 |
| 1789 | 161 |
|
1995
f0acfa753973
New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
162 void DicomFindAnswers::Add(const void* dicom, |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
163 size_t size) |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
164 { |
| 2059 | 165 answers_.push_back(new Answer(isWorklist_, dicom, size)); |
| 1789 | 166 } |
| 167 | |
| 168 | |
| 169 DicomFindAnswers::Answer& DicomFindAnswers::GetAnswerInternal(size_t index) const | |
| 170 { | |
| 171 if (index < answers_.size()) | |
| 172 { | |
| 173 return *answers_.at(index); | |
| 174 } | |
| 175 else | |
| 176 { | |
| 177 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 178 } | |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
179 } |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
180 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
181 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
182 ParsedDicomFile& DicomFindAnswers::GetAnswer(size_t index) const |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
183 { |
| 1789 | 184 return GetAnswerInternal(index).GetDicomFile(); |
| 185 } | |
| 186 | |
| 187 | |
| 188 DcmDataset* DicomFindAnswers::ExtractDcmDataset(size_t index) const | |
| 189 { | |
|
2202
9b373b7d6713
Fix handling of encodings in C-FIND requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2128
diff
changeset
|
190 return new DcmDataset(*GetAnswer(index).GetDcmtkObject().getDataset()); |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
191 } |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
192 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
193 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
194 void DicomFindAnswers::ToJson(Json::Value& target, |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
195 size_t index, |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
196 bool simplify) const |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
197 { |
|
1860
c7d70f659190
DicomToJsonFormat_Simple -> DicomToJsonFormat_Human
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1847
diff
changeset
|
198 DicomToJsonFormat format = (simplify ? DicomToJsonFormat_Human : DicomToJsonFormat_Full); |
|
2128
9329ba17a069
Possibility to DELETE "dicom-as-json" attachments to reconstruct them
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2059
diff
changeset
|
199 GetAnswer(index).DatasetToJson(target, format, DicomToJsonFlags_None, 0); |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
200 } |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
201 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
202 |
| 1368 | 203 void DicomFindAnswers::ToJson(Json::Value& target, |
| 204 bool simplify) const | |
| 0 | 205 { |
| 206 target = Json::arrayValue; | |
| 207 | |
| 208 for (size_t i = 0; i < GetSize(); i++) | |
| 209 { | |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
210 Json::Value answer; |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
211 ToJson(answer, i, simplify); |
| 0 | 212 target.append(answer); |
| 213 } | |
| 214 } | |
| 215 } |