Mercurial > hg > orthanc
annotate OrthancServer/OrthancMoveRequestHandler.cpp @ 2940:4767d36679ed
refactoring access to Orthanc configuration
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 29 Nov 2018 11:47:00 +0100 |
parents | 00504dcc996f |
children | 6896a7c1cbe2 |
rev | line source |
---|---|
619 | 1 /** |
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:
1231
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
2447
878b59270859
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
619 | 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 | |
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
33 |
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
34 #include "PrecompiledHeadersServer.h" |
619 | 35 #include "OrthancMoveRequestHandler.h" |
36 | |
2940
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
37 #include "OrthancConfiguration.h" |
2382
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
38 #include "../../Core/DicomParsing/FromDcmtkBridge.h" |
1371
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
39 #include "../Core/DicomFormat/DicomArray.h" |
1486
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
40 #include "../Core/Logging.h" |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
41 #include "ServerJobs/DicomModalityStoreJob.h" |
619 | 42 |
43 namespace Orthanc | |
44 { | |
45 namespace | |
46 { | |
47 // Anonymous namespace to avoid clashes between compilation modules | |
48 | |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
49 class SynchronousMove : public IMoveRequestIterator |
619 | 50 { |
51 private: | |
52 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
|
53 const std::string& localAet_; |
619 | 54 std::vector<std::string> instances_; |
55 size_t position_; | |
772
31cc399c7762
RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
771
diff
changeset
|
56 RemoteModalityParameters remote_; |
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
57 std::string originatorAet_; |
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
58 uint16_t originatorId_; |
2590
5e2730c8e23c
getting rid of ReusableDicomConnection in QueryRetrieveHandler and OrthancMoveRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
59 std::auto_ptr<DicomUserConnection> connection_; |
771 | 60 |
619 | 61 public: |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
62 SynchronousMove(ServerContext& context, |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
63 const std::string& targetAet, |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
64 const std::string& publicId, |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
65 const std::string& originatorAet, |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
66 uint16_t originatorId) : |
619 | 67 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
|
68 localAet_(context.GetDefaultLocalApplicationEntityTitle()), |
1907
5011a597b6ce
Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
69 position_(0), |
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
70 originatorAet_(originatorAet), |
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
71 originatorId_(originatorId) |
619 | 72 { |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
73 LOG(INFO) << "Sending resource " << publicId << " to modality \"" << targetAet << "\""; |
619 | 74 |
75 std::list<std::string> tmp; | |
76 context_.GetIndex().GetChildInstances(tmp, publicId); | |
77 | |
78 instances_.reserve(tmp.size()); | |
656 | 79 for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); ++it) |
619 | 80 { |
81 instances_.push_back(*it); | |
82 } | |
771 | 83 |
2940
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
84 { |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
85 OrthancConfiguration::ReaderLock lock; |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
86 remote_ = lock.GetConfiguration().GetModalityUsingAet(targetAet); |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
87 } |
619 | 88 } |
89 | |
90 virtual unsigned int GetSubOperationCount() const | |
91 { | |
92 return instances_.size(); | |
93 } | |
94 | |
95 virtual Status DoNext() | |
96 { | |
97 if (position_ >= instances_.size()) | |
98 { | |
99 return Status_Failure; | |
100 } | |
101 | |
102 const std::string& id = instances_[position_++]; | |
103 | |
104 std::string dicom; | |
2124 | 105 context_.ReadDicom(dicom, id); |
771 | 106 |
2590
5e2730c8e23c
getting rid of ReusableDicomConnection in QueryRetrieveHandler and OrthancMoveRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
107 if (connection_.get() == NULL) |
771 | 108 { |
2590
5e2730c8e23c
getting rid of ReusableDicomConnection in QueryRetrieveHandler and OrthancMoveRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
109 connection_.reset(new DicomUserConnection(localAet_, remote_)); |
771 | 110 } |
619 | 111 |
2590
5e2730c8e23c
getting rid of ReusableDicomConnection in QueryRetrieveHandler and OrthancMoveRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
112 connection_->Store(dicom, originatorAet_, originatorId_); |
5e2730c8e23c
getting rid of ReusableDicomConnection in QueryRetrieveHandler and OrthancMoveRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
113 |
619 | 114 return Status_Success; |
115 } | |
116 }; | |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
117 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
118 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
119 class AsynchronousMove : public IMoveRequestIterator |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
120 { |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
121 private: |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
122 ServerContext& context_; |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
123 std::auto_ptr<DicomModalityStoreJob> job_; |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
124 size_t position_; |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
125 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
126 public: |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
127 AsynchronousMove(ServerContext& context, |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
128 const std::string& targetAet, |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
129 const std::string& publicId, |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
130 const std::string& originatorAet, |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
131 uint16_t originatorId) : |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
132 context_(context), |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
133 job_(new DicomModalityStoreJob(context)), |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
134 position_(0) |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
135 { |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
136 LOG(INFO) << "Sending resource " << publicId << " to modality \"" << targetAet << "\""; |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
137 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
138 job_->SetDescription("C-MOVE"); |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
139 job_->SetPermissive(true); |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
140 job_->SetLocalAet(context.GetDefaultLocalApplicationEntityTitle()); |
2940
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
141 |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
142 { |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
143 OrthancConfiguration::ReaderLock lock; |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
144 job_->SetRemoteModality(lock.GetConfiguration().GetModalityUsingAet(targetAet)); |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
145 } |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
146 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
147 if (originatorId != 0) |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
148 { |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
149 job_->SetMoveOriginator(originatorAet, originatorId); |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
150 } |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
151 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
152 std::list<std::string> tmp; |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
153 context_.GetIndex().GetChildInstances(tmp, publicId); |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
154 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
155 job_->Reserve(tmp.size()); |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
156 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
157 for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); ++it) |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
158 { |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
159 job_->AddInstance(*it); |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
160 } |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
161 } |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
162 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
163 virtual unsigned int GetSubOperationCount() const |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
164 { |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
165 return 1; |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
166 } |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
167 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
168 virtual Status DoNext() |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
169 { |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
170 if (position_ == 0) |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
171 { |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
172 context_.GetJobsEngine().GetRegistry().Submit(job_.release(), 0 /* priority */); |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
173 return Status_Success; |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
174 } |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
175 else |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
176 { |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
177 return Status_Failure; |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
178 } |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
179 } |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
180 }; |
619 | 181 } |
182 | |
183 | |
1162 | 184 bool OrthancMoveRequestHandler::LookupIdentifier(std::string& publicId, |
1721
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
185 ResourceType level, |
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
186 const DicomMap& input) |
619 | 187 { |
1724
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
188 DicomTag tag(0, 0); // Dummy initialization |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
189 |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
190 switch (level) |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
191 { |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
192 case ResourceType_Patient: |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
193 tag = DICOM_TAG_PATIENT_ID; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
194 break; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
195 |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
196 case ResourceType_Study: |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
197 tag = (input.HasTag(DICOM_TAG_ACCESSION_NUMBER) ? |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
198 DICOM_TAG_ACCESSION_NUMBER : DICOM_TAG_STUDY_INSTANCE_UID); |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
199 break; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
200 |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
201 case ResourceType_Series: |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
202 tag = DICOM_TAG_SERIES_INSTANCE_UID; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
203 break; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
204 |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
205 case ResourceType_Instance: |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
206 tag = DICOM_TAG_SOP_INSTANCE_UID; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
207 break; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
208 |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
209 default: |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
210 throw OrthancException(ErrorCode_ParameterOutOfRange); |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
211 } |
1721
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
212 |
619 | 213 if (!input.HasTag(tag)) |
214 { | |
215 return false; | |
216 } | |
217 | |
1737
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
218 const DicomValue& value = input.GetValue(tag); |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
219 if (value.IsNull() || |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
220 value.IsBinary()) |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
221 { |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
222 return false; |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
223 } |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
224 |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
225 const std::string& content = value.GetContent(); |
619 | 226 |
227 std::list<std::string> ids; | |
1744
b3de74dec2d5
integration mainline->db-changes
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
228 context_.GetIndex().LookupIdentifierExact(ids, level, tag, content); |
619 | 229 |
230 if (ids.size() != 1) | |
231 { | |
232 return false; | |
233 } | |
234 else | |
235 { | |
236 publicId = ids.front(); | |
237 return true; | |
238 } | |
239 } | |
240 | |
241 | |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
242 static IMoveRequestIterator* CreateIterator(ServerContext& context, |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
243 const std::string& targetAet, |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
244 const std::string& publicId, |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
245 const std::string& originatorAet, |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
246 uint16_t originatorId) |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
247 { |
2940
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
248 bool synchronous; |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
249 |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
250 { |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
251 OrthancConfiguration::ReaderLock lock; |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
252 synchronous = lock.GetConfiguration().GetBooleanParameter("SynchronousCMove", true); |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
253 } |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
254 |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
255 if (synchronous) |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
256 { |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
257 return new SynchronousMove(context, targetAet, publicId, originatorAet, originatorId); |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
258 } |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
259 else |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
260 { |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
261 return new AsynchronousMove(context, targetAet, publicId, originatorAet, originatorId); |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
262 } |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
263 } |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
264 |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
265 |
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
266 IMoveRequestIterator* OrthancMoveRequestHandler::Handle(const std::string& targetAet, |
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
267 const DicomMap& input, |
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
268 const std::string& originatorIp, |
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
269 const std::string& originatorAet, |
1909
21fcfc428dc2
another semantics for Originator Message ID
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1907
diff
changeset
|
270 const std::string& calledAet, |
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
271 uint16_t originatorId) |
619 | 272 { |
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
273 LOG(WARNING) << "Move-SCU request received for AET \"" << targetAet << "\""; |
619 | 274 |
1371
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
275 { |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
276 DicomArray query(input); |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
277 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
|
278 { |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
279 if (!query.GetElement(i).GetValue().IsNull()) |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
280 { |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
281 LOG(INFO) << " " << query.GetElement(i).GetTag() |
2115
a657f7772e69
Handling of private tags/creators in the "Dictionary" configuration option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1909
diff
changeset
|
282 << " " << FromDcmtkBridge::GetTagName(query.GetElement(i)) |
1737
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
283 << " = " << query.GetElement(i).GetValue().GetContent(); |
1371
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
284 } |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
285 } |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
286 } |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
287 |
619 | 288 /** |
289 * Retrieve the query level. | |
290 **/ | |
291 | |
292 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
|
293 |
1737
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
294 if (levelTmp == NULL || |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
295 levelTmp->IsNull() || |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
296 levelTmp->IsBinary()) |
619 | 297 { |
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
298 // 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
|
299 // 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
|
300 // 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
|
301 // 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
|
302 // 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
|
303 |
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
304 std::string publicId; |
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
305 |
1721
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
306 if (LookupIdentifier(publicId, ResourceType_Instance, input) || |
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
307 LookupIdentifier(publicId, ResourceType_Series, input) || |
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
308 LookupIdentifier(publicId, ResourceType_Study, input) || |
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
309 LookupIdentifier(publicId, ResourceType_Patient, input)) |
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
310 { |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
311 return CreateIterator(context_, targetAet, publicId, originatorAet, originatorId); |
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
312 } |
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
313 else |
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
314 { |
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
315 // 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
|
316 throw OrthancException(ErrorCode_BadRequest); |
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
317 } |
619 | 318 } |
319 | |
1721
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
320 assert(levelTmp != NULL); |
1737
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
321 ResourceType level = StringToResourceType(levelTmp->GetContent().c_str()); |
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
322 |
619 | 323 |
324 /** | |
325 * Lookup for the resource to be sent. | |
326 **/ | |
327 | |
328 std::string publicId; | |
329 | |
1721
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
330 if (LookupIdentifier(publicId, level, input)) |
619 | 331 { |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
332 return CreateIterator(context_, targetAet, publicId, originatorAet, originatorId); |
619 | 333 } |
1721
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
334 else |
619 | 335 { |
336 throw OrthancException(ErrorCode_BadRequest); | |
337 } | |
338 } | |
339 } |