Mercurial > hg > orthanc
annotate OrthancServer/OrthancGetRequestHandler.cpp @ 3954:67b457283499 c-get
coding style
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 20 May 2020 09:52:20 +0200 |
parents | 620e87e9e816 |
children | 66879215cbf3 |
rev | line source |
---|---|
3818 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
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 General Public License as | |
9 * published by the Free Software Foundation, either version 3 of the | |
10 * License, or (at your option) any later version. | |
11 * | |
12 * In addition, as a special exception, the copyright holders of this | |
13 * program give permission to link the code of its release with the | |
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
15 * that use the same license as the "OpenSSL" library), and distribute | |
16 * the linked executables. You must obey the GNU General Public License | |
17 * in all respects for all of the code used other than "OpenSSL". If you | |
18 * modify file(s) with this exception, you may extend this exception to | |
19 * your version of the file(s), but you are not obligated to do so. If | |
20 * you do not wish to do so, delete this exception statement from your | |
21 * version. If you delete this exception statement from all source files | |
22 * in the program, then also delete it here. | |
23 * | |
24 * This program is distributed in the hope that it will be useful, but | |
25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
27 * General Public License for more details. | |
28 * | |
29 * You should have received a copy of the GNU General Public License | |
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
31 **/ | |
32 | |
33 #include "PrecompiledHeadersServer.h" | |
34 #include "OrthancGetRequestHandler.h" | |
35 | |
36 #include <dcmtk/dcmnet/assoc.h> | |
37 #include <dcmtk/dcmnet/dimse.h> | |
38 #include <dcmtk/dcmdata/dcdeftag.h> | |
39 #include <dcmtk/dcmdata/dcistrmb.h> | |
40 #include <dcmtk/dcmnet/diutil.h> | |
41 | |
42 #include "../../Core/DicomParsing/FromDcmtkBridge.h" | |
43 #include "../Core/DicomFormat/DicomArray.h" | |
44 #include "../Core/Logging.h" | |
45 #include "../Core/MetricsRegistry.h" | |
46 #include "OrthancConfiguration.h" | |
47 #include "ServerContext.h" | |
48 #include "ServerJobs/DicomModalityStoreJob.h" | |
49 | |
50 | |
51 | |
52 namespace Orthanc | |
53 { | |
54 namespace | |
55 { | |
56 // Anonymous namespace to avoid clashes between compilation modules | |
57 | |
58 static void getSubOpProgressCallback(void * /* callbackData */, | |
59 T_DIMSE_StoreProgress *progress, | |
60 T_DIMSE_C_StoreRQ * /*req*/) | |
61 { | |
62 // SBL - no logging to be done here. | |
63 } | |
64 } | |
65 | |
66 OrthancGetRequestHandler::Status OrthancGetRequestHandler::DoNext(T_ASC_Association* assoc) | |
67 { | |
68 if (position_ >= instances_.size()) | |
69 { | |
70 return Status_Failure; | |
71 } | |
72 | |
73 const std::string& id = instances_[position_++]; | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
74 |
3818 | 75 std::string dicom; |
76 context_.ReadDicom(dicom, id); | |
77 | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
78 if (dicom.size() <= 0) |
3818 | 79 { |
80 return Status_Failure; | |
81 } | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
82 |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
83 std::unique_ptr<DcmFileFormat> parsed( |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
84 FromDcmtkBridge::LoadFromMemoryBuffer(dicom.c_str(), dicom.size())); |
3818 | 85 |
86 // Determine the storage SOP class UID for this instance | |
87 DIC_UI sopClass; | |
88 DIC_UI sopInstance; | |
3954 | 89 |
90 { | |
91 bool ok; | |
92 | |
3818 | 93 #if DCMTK_VERSION_NUMBER >= 364 |
3954 | 94 ok = DU_findSOPClassAndInstanceInDataSet(static_cast<DcmItem *> (parsed->getDataset()), |
95 sopClass, sizeof(sopClass), | |
96 sopInstance, sizeof(sopInstance)); | |
3818 | 97 #else |
3954 | 98 ok = DU_findSOPClassAndInstanceInDataSet(parsed->getDataset(), sopClass, sopInstance); |
3818 | 99 #endif |
3954 | 100 |
101 if (!ok) | |
3818 | 102 { |
103 throw OrthancException(ErrorCode_NoSopClassOrInstance, | |
104 "Unable to determine the SOP class/instance for C-STORE with AET " + | |
105 originatorAet_); | |
106 } | |
3954 | 107 } |
3818 | 108 |
3954 | 109 OFCondition cond = PerformGetSubOp(assoc, sopClass, sopInstance, parsed->getDataset()); |
110 | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
111 if (getCancelled_) |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
112 { |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
113 LOG(INFO) << "Get SCP: Received C-Cancel RQ"; |
3818 | 114 } |
115 | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
116 if (cond.bad() || getCancelled_) |
3818 | 117 { |
118 return Status_Failure; | |
119 } | |
120 | |
121 return Status_Success; | |
122 } | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
123 |
3818 | 124 |
3954 | 125 void OrthancGetRequestHandler::AddFailedUIDInstance(const char *sopInstance) |
3818 | 126 { |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
127 if (failedUIDs_.empty()) |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
128 { |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
129 failedUIDs_ = sopInstance; |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
130 } |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
131 else |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
132 { |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
133 failedUIDs_ += "\\" + std::string(sopInstance); |
3818 | 134 } |
135 } | |
136 | |
137 | |
3954 | 138 OFCondition OrthancGetRequestHandler::PerformGetSubOp(T_ASC_Association* assoc, |
3818 | 139 DIC_UI sopClass, |
140 DIC_UI sopInstance, | |
141 DcmDataset *dataset) | |
142 { | |
143 OFCondition cond = EC_Normal; | |
144 T_DIMSE_C_StoreRQ req; | |
145 T_DIMSE_C_StoreRSP rsp; | |
146 DIC_US msgId; | |
147 T_ASC_PresentationContextID presId; | |
148 DcmDataset *stDetail = NULL; | |
149 | |
150 msgId = assoc->nextMsgID++; | |
151 | |
152 // which presentation context should be used | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
153 presId = ASC_findAcceptedPresentationContextID(assoc, sopClass); |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
154 |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
155 if (presId == 0) |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
156 { |
3818 | 157 nFailed_++; |
3954 | 158 AddFailedUIDInstance(sopInstance); |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
159 LOG(ERROR) << "Get SCP: storeSCU: No presentation context for: (" |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
160 << dcmSOPClassUIDToModality(sopClass, "OT") << ") " << sopClass; |
3818 | 161 return DIMSE_NOVALIDPRESENTATIONCONTEXTID; |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
162 } |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
163 else |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
164 { |
3818 | 165 // make sure that we can send images in this presentation context |
166 T_ASC_PresentationContext pc; | |
167 ASC_findAcceptedPresentationContext(assoc->params, presId, &pc); | |
168 // the acceptedRole is the association requestor role | |
3954 | 169 if ((pc.acceptedRole != ASC_SC_ROLE_SCP) && |
170 (pc.acceptedRole != ASC_SC_ROLE_SCUSCP)) | |
3818 | 171 { |
172 // the role is not appropriate | |
173 nFailed_++; | |
3954 | 174 AddFailedUIDInstance(sopInstance); |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
175 LOG(ERROR) <<"Get SCP: storeSCU: [No presentation context with requestor SCP role for: (" |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
176 << dcmSOPClassUIDToModality(sopClass, "OT") << ") " << sopClass; |
3818 | 177 return DIMSE_NOVALIDPRESENTATIONCONTEXTID; |
178 } | |
179 } | |
180 | |
181 req.MessageID = msgId; | |
182 strcpy(req.AffectedSOPClassUID, sopClass); | |
183 strcpy(req.AffectedSOPInstanceUID, sopInstance); | |
184 req.DataSetType = DIMSE_DATASET_PRESENT; | |
185 req.Priority = priority_; | |
186 req.opts = 0; | |
187 | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
188 LOG(INFO) << "Store SCU RQ: MsgID " << msgId << ", (" |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
189 << dcmSOPClassUIDToModality(sopClass, "OT") << ")"; |
3818 | 190 |
191 T_DIMSE_DetectedCancelParameters cancelParameters; | |
192 | |
193 cond = DIMSE_storeUser(assoc, presId, &req, | |
194 NULL, dataset, getSubOpProgressCallback, this, DIMSE_BLOCKING, 0, | |
195 &rsp, &stDetail, &cancelParameters); | |
196 | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
197 if (cond.good()) |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
198 { |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
199 if (cancelParameters.cancelEncountered) |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
200 { |
3954 | 201 if (origPresId_ == cancelParameters.presId && |
202 origMsgId_ == cancelParameters.req.MessageIDBeingRespondedTo) | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
203 { |
3818 | 204 getCancelled_ = OFTrue; |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
205 } |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
206 else |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
207 { |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
208 LOG(ERROR) << "Get SCP: Unexpected C-Cancel-RQ encountered: pid=" << (int)cancelParameters.presId |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
209 << ", mid=" << (int)cancelParameters.req.MessageIDBeingRespondedTo; |
3818 | 210 } |
211 } | |
212 | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
213 if (rsp.DimseStatus == STATUS_Success) |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
214 { |
3818 | 215 // everything ok |
216 nCompleted_++; | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
217 } |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
218 else if ((rsp.DimseStatus & 0xf000) == 0xb000) |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
219 { |
3818 | 220 // a warning status message |
221 warningCount_++; | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
222 LOG(ERROR) << "Get SCP: Store Warning: Response Status: " |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
223 << DU_cstoreStatusString(rsp.DimseStatus); |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
224 } |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
225 else |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
226 { |
3818 | 227 nFailed_++; |
3954 | 228 AddFailedUIDInstance(sopInstance); |
3818 | 229 // print a status message |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
230 LOG(ERROR) << "Get SCP: Store Failed: Response Status: " |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
231 << DU_cstoreStatusString(rsp.DimseStatus); |
3818 | 232 } |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
233 } |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
234 else |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
235 { |
3818 | 236 nFailed_++; |
3954 | 237 AddFailedUIDInstance(sopInstance); |
3818 | 238 OFString temp_str; |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
239 LOG(ERROR) << "Get SCP: storeSCU: Store Request Failed: " << DimseCondition::dump(temp_str, cond); |
3818 | 240 } |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
241 |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
242 if (stDetail) |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
243 { |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
244 LOG(INFO) << " Status Detail:" << OFendl << DcmObject::PrintHelper(*stDetail); |
3818 | 245 delete stDetail; |
246 } | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
247 |
3818 | 248 return cond; |
249 } | |
250 | |
251 bool OrthancGetRequestHandler::LookupIdentifiers(std::vector<std::string>& publicIds, | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
252 ResourceType level, |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
253 const DicomMap& input) |
3818 | 254 { |
255 DicomTag tag(0, 0); // Dummy initialization | |
256 | |
257 switch (level) | |
258 { | |
259 case ResourceType_Patient: | |
260 tag = DICOM_TAG_PATIENT_ID; | |
261 break; | |
262 | |
263 case ResourceType_Study: | |
264 tag = (input.HasTag(DICOM_TAG_ACCESSION_NUMBER) ? | |
265 DICOM_TAG_ACCESSION_NUMBER : DICOM_TAG_STUDY_INSTANCE_UID); | |
266 break; | |
267 | |
268 case ResourceType_Series: | |
269 tag = DICOM_TAG_SERIES_INSTANCE_UID; | |
270 break; | |
271 | |
272 case ResourceType_Instance: | |
273 tag = DICOM_TAG_SOP_INSTANCE_UID; | |
274 break; | |
275 | |
276 default: | |
277 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
278 } | |
279 | |
280 if (!input.HasTag(tag)) | |
281 { | |
282 return false; | |
283 } | |
284 | |
285 const DicomValue& value = input.GetValue(tag); | |
286 if (value.IsNull() || | |
287 value.IsBinary()) | |
288 { | |
289 return false; | |
290 } | |
291 else | |
292 { | |
293 const std::string& content = value.GetContent(); | |
294 context_.GetIndex().LookupIdentifierExact(publicIds, level, tag, content); | |
295 return true; | |
296 } | |
297 } | |
298 | |
299 | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
300 OrthancGetRequestHandler::OrthancGetRequestHandler(ServerContext& context) : |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
301 context_(context) |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
302 { |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
303 position_ = 0; |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
304 nRemaining_ = 0; |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
305 nCompleted_ = 0; |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
306 warningCount_ = 0; |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
307 nFailed_ = 0; |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
308 } |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
309 |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
310 |
3818 | 311 bool OrthancGetRequestHandler::Handle(const DicomMap& input, |
312 const std::string& originatorIp, | |
313 const std::string& originatorAet, | |
314 const std::string& calledAet) | |
315 { | |
316 MetricsRegistry::Timer timer(context_.GetMetricsRegistry(), "orthanc_get_scp_duration_ms"); | |
317 | |
318 LOG(WARNING) << "Get-SCU request received from AET \"" << originatorAet << "\""; | |
319 | |
320 { | |
321 DicomArray query(input); | |
322 for (size_t i = 0; i < query.GetSize(); i++) | |
323 { | |
324 if (!query.GetElement(i).GetValue().IsNull()) | |
325 { | |
326 LOG(INFO) << " " << query.GetElement(i).GetTag() | |
327 << " " << FromDcmtkBridge::GetTagName(query.GetElement(i)) | |
328 << " = " << query.GetElement(i).GetValue().GetContent(); | |
329 } | |
330 } | |
331 } | |
332 | |
333 /** | |
334 * Retrieve the query level. | |
335 **/ | |
336 | |
337 const DicomValue* levelTmp = input.TestAndGetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL); | |
338 | |
339 assert(levelTmp != NULL); | |
340 ResourceType level = StringToResourceType(levelTmp->GetContent().c_str()); | |
341 | |
342 | |
343 /** | |
344 * Lookup for the resource to be sent. | |
345 **/ | |
346 | |
347 std::vector<std::string> publicIds; | |
348 | |
3954 | 349 if (!LookupIdentifiers(publicIds, level, input)) |
350 { | |
351 LOG(ERROR) << "Cannot determine what resources are requested by C-GET"; | |
352 return false; | |
353 } | |
354 | |
3818 | 355 localAet_ = context_.GetDefaultLocalApplicationEntityTitle(); |
356 position_ = 0; | |
357 originatorAet_ = originatorAet; | |
358 | |
359 { | |
360 OrthancConfiguration::ReaderLock lock; | |
361 remote_ = lock.GetConfiguration().GetModalityUsingAet(originatorAet); | |
362 } | |
363 | |
364 for (size_t i = 0; i < publicIds.size(); i++) | |
365 { | |
3954 | 366 LOG(INFO) << "C-GET: Sending resource " << publicIds[i] |
367 << " to modality \"" << originatorAet << "\""; | |
3818 | 368 |
369 std::list<std::string> tmp; | |
370 context_.GetIndex().GetChildInstances(tmp, publicIds[i]); | |
371 | |
372 instances_.reserve(tmp.size()); | |
373 for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); ++it) | |
374 { | |
375 instances_.push_back(*it); | |
376 } | |
377 } | |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
378 |
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3859
diff
changeset
|
379 failedUIDs_.clear(); |
3818 | 380 getCancelled_ = OFFalse; |
381 | |
382 nRemaining_ = GetSubOperationCount(); | |
383 nCompleted_ = 0; | |
384 nFailed_ = 0; | |
385 warningCount_ = 0; | |
386 | |
3954 | 387 return true; |
3818 | 388 } |
389 }; |