Mercurial > hg > orthanc
annotate OrthancServer/OrthancMoveRequestHandler.cpp @ 1543:8b6d8f9b9f71
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 13 Aug 2015 17:26:46 +0200 |
| parents | f967bdf8534e |
| children | 3309878b3e16 |
| rev | line source |
|---|---|
| 619 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1231
diff
changeset
|
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics |
|
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1231
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
| 619 | 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 | |
|
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
32 |
|
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
33 #include "PrecompiledHeadersServer.h" |
| 619 | 34 #include "OrthancMoveRequestHandler.h" |
| 35 | |
| 36 #include "OrthancInitialization.h" | |
|
1371
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
37 #include "FromDcmtkBridge.h" |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
38 #include "../Core/DicomFormat/DicomArray.h" |
|
1486
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
39 #include "../Core/Logging.h" |
| 619 | 40 |
| 41 namespace Orthanc | |
| 42 { | |
| 43 namespace | |
| 44 { | |
| 45 // Anonymous namespace to avoid clashes between compilation modules | |
| 46 | |
| 47 class OrthancMoveRequestIterator : public IMoveRequestIterator | |
| 48 { | |
| 49 private: | |
| 50 ServerContext& context_; | |
|
1427
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1371
diff
changeset
|
51 const std::string& localAet_; |
| 619 | 52 std::vector<std::string> instances_; |
| 53 size_t position_; | |
|
772
31cc399c7762
RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
771
diff
changeset
|
54 RemoteModalityParameters remote_; |
| 771 | 55 |
| 619 | 56 public: |
| 57 OrthancMoveRequestIterator(ServerContext& context, | |
| 771 | 58 const std::string& aet, |
| 619 | 59 const std::string& publicId) : |
| 60 context_(context), | |
|
1427
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1371
diff
changeset
|
61 localAet_(context.GetDefaultLocalApplicationEntityTitle()), |
|
772
31cc399c7762
RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
771
diff
changeset
|
62 position_(0) |
| 619 | 63 { |
| 771 | 64 LOG(INFO) << "Sending resource " << publicId << " to modality \"" << aet << "\""; |
| 619 | 65 |
| 66 std::list<std::string> tmp; | |
| 67 context_.GetIndex().GetChildInstances(tmp, publicId); | |
| 68 | |
| 69 instances_.reserve(tmp.size()); | |
| 656 | 70 for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); ++it) |
| 619 | 71 { |
| 72 instances_.push_back(*it); | |
| 73 } | |
| 771 | 74 |
|
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
776
diff
changeset
|
75 remote_ = Configuration::GetModalityUsingAet(aet); |
| 619 | 76 } |
| 77 | |
| 78 virtual unsigned int GetSubOperationCount() const | |
| 79 { | |
| 80 return instances_.size(); | |
| 81 } | |
| 82 | |
| 83 virtual Status DoNext() | |
| 84 { | |
| 85 if (position_ >= instances_.size()) | |
| 86 { | |
| 87 return Status_Failure; | |
| 88 } | |
| 89 | |
| 90 const std::string& id = instances_[position_++]; | |
| 91 | |
| 92 std::string dicom; | |
| 93 context_.ReadFile(dicom, id, FileContentType_Dicom); | |
| 771 | 94 |
| 95 { | |
| 776 | 96 ReusableDicomUserConnection::Locker locker |
|
1427
d710ea64f0fd
Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1371
diff
changeset
|
97 (context_.GetReusableDicomUserConnection(), localAet_, remote_); |
| 776 | 98 locker.GetConnection().Store(dicom); |
| 771 | 99 } |
| 619 | 100 |
| 101 return Status_Success; | |
| 102 } | |
| 103 }; | |
| 104 } | |
| 105 | |
| 106 | |
| 1162 | 107 bool OrthancMoveRequestHandler::LookupIdentifier(std::string& publicId, |
|
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
108 DicomTag tag, |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
109 const DicomMap& input) |
| 619 | 110 { |
| 111 if (!input.HasTag(tag)) | |
| 112 { | |
| 113 return false; | |
| 114 } | |
| 115 | |
| 116 std::string value = input.GetValue(tag).AsString(); | |
| 117 | |
| 118 std::list<std::string> ids; | |
| 1162 | 119 context_.GetIndex().LookupIdentifier(ids, tag, value); |
| 619 | 120 |
| 121 if (ids.size() != 1) | |
| 122 { | |
| 123 return false; | |
| 124 } | |
| 125 else | |
| 126 { | |
| 127 publicId = ids.front(); | |
| 128 return true; | |
| 129 } | |
| 130 } | |
| 131 | |
| 132 | |
| 771 | 133 IMoveRequestIterator* OrthancMoveRequestHandler::Handle(const std::string& aet, |
| 619 | 134 const DicomMap& input) |
| 135 { | |
| 771 | 136 LOG(WARNING) << "Move-SCU request received for AET \"" << aet << "\""; |
| 619 | 137 |
|
1371
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
138 { |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
139 DicomArray query(input); |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
140 for (size_t i = 0; i < query.GetSize(); i++) |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
141 { |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
142 if (!query.GetElement(i).GetValue().IsNull()) |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
143 { |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
144 LOG(INFO) << " " << query.GetElement(i).GetTag() |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
145 << " " << FromDcmtkBridge::GetName(query.GetElement(i).GetTag()) |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
146 << " = " << query.GetElement(i).GetValue().AsString(); |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
147 } |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
148 } |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
149 } |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
150 |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
151 |
|
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
152 |
| 619 | 153 /** |
| 154 * Retrieve the query level. | |
| 155 **/ | |
| 156 | |
|
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
157 ResourceType level; |
| 619 | 158 const DicomValue* levelTmp = input.TestAndGetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL); |
|
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
159 |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
160 if (levelTmp != NULL) |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
161 { |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
162 level = StringToResourceType(levelTmp->AsString().c_str()); |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
163 } |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
164 else |
| 619 | 165 { |
|
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
166 // The query level is not present in the C-Move request, which |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
167 // does not follow the DICOM standard. This is for instance the |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
168 // behavior of Tudor DICOM. Try and automatically deduce the |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
169 // query level: Start from the instance level, going up to the |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
170 // patient level until a valid DICOM identifier is found. |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
171 |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
172 std::string publicId; |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
173 |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
174 if (LookupIdentifier(publicId, DICOM_TAG_SOP_INSTANCE_UID, input) || |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
175 LookupIdentifier(publicId, DICOM_TAG_SERIES_INSTANCE_UID, input) || |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
176 LookupIdentifier(publicId, DICOM_TAG_STUDY_INSTANCE_UID, input) || |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
177 LookupIdentifier(publicId, DICOM_TAG_PATIENT_ID, input)) |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
178 { |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
179 return new OrthancMoveRequestIterator(context_, aet, publicId); |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
180 } |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
181 else |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
182 { |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
183 // No identifier is present in the request. |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
184 throw OrthancException(ErrorCode_BadRequest); |
|
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
185 } |
| 619 | 186 } |
| 187 | |
|
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
188 |
| 619 | 189 |
| 190 /** | |
| 191 * Lookup for the resource to be sent. | |
| 192 **/ | |
| 193 | |
| 194 bool ok; | |
| 195 std::string publicId; | |
| 196 | |
| 197 switch (level) | |
| 198 { | |
| 199 case ResourceType_Patient: | |
| 1162 | 200 ok = LookupIdentifier(publicId, DICOM_TAG_PATIENT_ID, input); |
| 619 | 201 break; |
| 202 | |
| 203 case ResourceType_Study: | |
| 1162 | 204 ok = LookupIdentifier(publicId, DICOM_TAG_STUDY_INSTANCE_UID, input); |
| 619 | 205 break; |
| 206 | |
| 207 case ResourceType_Series: | |
| 1162 | 208 ok = LookupIdentifier(publicId, DICOM_TAG_SERIES_INSTANCE_UID, input); |
| 619 | 209 break; |
| 210 | |
| 211 case ResourceType_Instance: | |
| 1162 | 212 ok = LookupIdentifier(publicId, DICOM_TAG_SOP_INSTANCE_UID, input); |
| 619 | 213 break; |
| 214 | |
| 215 default: | |
| 216 ok = false; | |
| 217 } | |
| 218 | |
| 219 if (!ok) | |
| 220 { | |
| 221 throw OrthancException(ErrorCode_BadRequest); | |
| 222 } | |
| 223 | |
| 771 | 224 return new OrthancMoveRequestIterator(context_, aet, publicId); |
| 619 | 225 } |
| 226 } |