Mercurial > hg > orthanc
annotate OrthancServer/Sources/OrthancMoveRequestHandler.cpp @ 5117:849000df79b6
fix missing handling of StoreStatus_StorageFull
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 02 Dec 2022 15:32:53 +0100 |
parents | 6eff25f70121 |
children | 0ea402b4d901 |
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 |
4870
43e613a7756b
upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4831
diff
changeset
|
5 * Copyright (C) 2017-2022 Osimis S.A., Belgium |
43e613a7756b
upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4831
diff
changeset
|
6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
619 | 7 * |
8 * This program is free software: you can redistribute it and/or | |
9 * modify it under the terms of the GNU General Public License as | |
10 * published by the Free Software Foundation, either version 3 of the | |
11 * License, or (at your option) any later version. | |
12 * | |
13 * This program is distributed in the hope that it will be useful, but | |
14 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU General Public License | |
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
20 **/ | |
21 | |
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
810
diff
changeset
|
22 |
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
23 #include "PrecompiledHeadersServer.h" |
619 | 24 #include "OrthancMoveRequestHandler.h" |
25 | |
4045 | 26 #include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h" |
27 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" | |
28 #include "../../OrthancFramework/Sources/Logging.h" | |
29 #include "../../OrthancFramework/Sources/MetricsRegistry.h" | |
30 | |
3095
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3061
diff
changeset
|
31 #include "OrthancConfiguration.h" |
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3061
diff
changeset
|
32 #include "ServerContext.h" |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
33 #include "ServerJobs/DicomModalityStoreJob.h" |
619 | 34 |
3097 | 35 |
619 | 36 namespace Orthanc |
37 { | |
38 namespace | |
39 { | |
40 // Anonymous namespace to avoid clashes between compilation modules | |
41 | |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
42 class SynchronousMove : public IMoveRequestIterator |
619 | 43 { |
44 private: | |
45 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
|
46 const std::string& localAet_; |
619 | 47 std::vector<std::string> instances_; |
48 size_t position_; | |
772
31cc399c7762
RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
771
diff
changeset
|
49 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
|
50 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
|
51 uint16_t originatorId_; |
3863
9973d10bc5c4
switch to DicomStoreUserConnection in Lua routing, C-MOVE handler and straight C-STORE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3734
diff
changeset
|
52 std::unique_ptr<DicomStoreUserConnection> connection_; |
771 | 53 |
619 | 54 public: |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
55 SynchronousMove(ServerContext& context, |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
56 const std::string& targetAet, |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
57 const std::vector<std::string>& publicIds, |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
58 const std::string& originatorAet, |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
59 uint16_t originatorId) : |
619 | 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()), |
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
|
62 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
|
63 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
|
64 originatorId_(originatorId) |
619 | 65 { |
2940
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
66 { |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
67 OrthancConfiguration::ReaderLock lock; |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
68 remote_ = lock.GetConfiguration().GetModalityUsingAet(targetAet); |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
69 } |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
70 |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
71 for (size_t i = 0; i < publicIds.size(); i++) |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
72 { |
4287
5a3374b6e707
using CLOG in Orthanc DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4174
diff
changeset
|
73 CLOG(INFO, DICOM) << "Sending resource " << publicIds[i] << " to modality \"" |
5a3374b6e707
using CLOG in Orthanc DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4174
diff
changeset
|
74 << targetAet << "\" in synchronous mode"; |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
75 |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
76 std::list<std::string> tmp; |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
77 context_.GetIndex().GetChildInstances(tmp, publicIds[i]); |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
78 |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
79 instances_.reserve(tmp.size()); |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
80 for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); ++it) |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
81 { |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
82 instances_.push_back(*it); |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
83 } |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
84 } |
619 | 85 } |
86 | |
87 virtual unsigned int GetSubOperationCount() const | |
88 { | |
89 return instances_.size(); | |
90 } | |
91 | |
92 virtual Status DoNext() | |
93 { | |
94 if (position_ >= instances_.size()) | |
95 { | |
96 return Status_Failure; | |
97 } | |
98 | |
99 const std::string& id = instances_[position_++]; | |
100 | |
101 std::string dicom; | |
2124 | 102 context_.ReadDicom(dicom, id); |
771 | 103 |
2590
5e2730c8e23c
getting rid of ReusableDicomConnection in QueryRetrieveHandler and OrthancMoveRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
104 if (connection_.get() == NULL) |
771 | 105 { |
3874
2effa961f67f
forcing use of DicomAssociationParameters if creating an SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3863
diff
changeset
|
106 DicomAssociationParameters params(localAet_, remote_); |
2effa961f67f
forcing use of DicomAssociationParameters if creating an SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3863
diff
changeset
|
107 connection_.reset(new DicomStoreUserConnection(params)); |
771 | 108 } |
619 | 109 |
3734
4fc24b69446a
triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3712
diff
changeset
|
110 std::string sopClassUid, sopInstanceUid; // Unused |
4174
067c679626a2
Fix transcoding in C-MOVE SCP, in the case where "SynchronousCMove" is "true"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4165
diff
changeset
|
111 context_.StoreWithTranscoding(sopClassUid, sopInstanceUid, *connection_, dicom, |
067c679626a2
Fix transcoding in C-MOVE SCP, in the case where "SynchronousCMove" is "true"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4165
diff
changeset
|
112 true, originatorAet_, originatorId_); |
2590
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: |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3700
diff
changeset
|
122 ServerContext& context_; |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3700
diff
changeset
|
123 std::unique_ptr<DicomModalityStoreJob> job_; |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3700
diff
changeset
|
124 size_t position_; |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3700
diff
changeset
|
125 size_t countInstances_; |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
126 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
127 public: |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
128 AsynchronousMove(ServerContext& context, |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
129 const std::string& targetAet, |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
130 const std::vector<std::string>& publicIds, |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
131 const std::string& originatorAet, |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
132 uint16_t originatorId) : |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
133 context_(context), |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
134 job_(new DicomModalityStoreJob(context)), |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
135 position_(0) |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
136 { |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
137 job_->SetDescription("C-MOVE"); |
3700
5cbbf14e516b
Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3697
diff
changeset
|
138 //job_->SetPermissive(true); // This was the behavior of Orthanc < 1.6.0 |
5cbbf14e516b
Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3697
diff
changeset
|
139 job_->SetPermissive(false); |
2624
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 |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
152 for (size_t i = 0; i < publicIds.size(); i++) |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
153 { |
4287
5a3374b6e707
using CLOG in Orthanc DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4174
diff
changeset
|
154 CLOG(INFO, DICOM) << "Sending resource " << publicIds[i] << " to modality \"" |
5a3374b6e707
using CLOG in Orthanc DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4174
diff
changeset
|
155 << targetAet << "\" in asynchronous mode"; |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
156 |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
157 std::list<std::string> tmp; |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
158 context_.GetIndex().GetChildInstances(tmp, publicIds[i]); |
3157
8a9eb767280c
Fix issue #128 (Asynchronous C-MOVE: invalid number of remaining sub-operations)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3097
diff
changeset
|
159 |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
160 countInstances_ = tmp.size(); |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
161 |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
162 job_->Reserve(job_->GetCommandsCount() + tmp.size()); |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
163 |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
164 for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); ++it) |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
165 { |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
166 job_->AddInstance(*it); |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
167 } |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
168 } |
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 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
171 virtual unsigned int GetSubOperationCount() const |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
172 { |
3157
8a9eb767280c
Fix issue #128 (Asynchronous C-MOVE: invalid number of remaining sub-operations)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3097
diff
changeset
|
173 return countInstances_; |
2624
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 |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
176 virtual Status DoNext() |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
177 { |
3157
8a9eb767280c
Fix issue #128 (Asynchronous C-MOVE: invalid number of remaining sub-operations)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3097
diff
changeset
|
178 if (position_ >= countInstances_) |
8a9eb767280c
Fix issue #128 (Asynchronous C-MOVE: invalid number of remaining sub-operations)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3097
diff
changeset
|
179 { |
8a9eb767280c
Fix issue #128 (Asynchronous C-MOVE: invalid number of remaining sub-operations)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3097
diff
changeset
|
180 return Status_Failure; |
8a9eb767280c
Fix issue #128 (Asynchronous C-MOVE: invalid number of remaining sub-operations)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3097
diff
changeset
|
181 } |
8a9eb767280c
Fix issue #128 (Asynchronous C-MOVE: invalid number of remaining sub-operations)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3097
diff
changeset
|
182 |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
183 if (position_ == 0) |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
184 { |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
185 context_.GetJobsEngine().GetRegistry().Submit(job_.release(), 0 /* priority */); |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
186 } |
3157
8a9eb767280c
Fix issue #128 (Asynchronous C-MOVE: invalid number of remaining sub-operations)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3097
diff
changeset
|
187 |
8a9eb767280c
Fix issue #128 (Asynchronous C-MOVE: invalid number of remaining sub-operations)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3097
diff
changeset
|
188 position_ ++; |
8a9eb767280c
Fix issue #128 (Asynchronous C-MOVE: invalid number of remaining sub-operations)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3097
diff
changeset
|
189 return Status_Success; |
2624
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
190 } |
714dcddeb65f
asynchronous c-movoe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2590
diff
changeset
|
191 }; |
619 | 192 } |
193 | |
194 | |
4165
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
195 static bool IsNonEmptyTag(const DicomMap& dicom, |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
196 const DicomTag& tag) |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
197 { |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
198 const DicomValue* value = dicom.TestAndGetValue(tag); |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
199 if (value == NULL || |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
200 value->IsNull() || |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
201 value->IsBinary()) |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
202 { |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
203 return false; |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
204 } |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
205 else |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
206 { |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
207 return !value->GetContent().empty(); |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
208 } |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
209 } |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
210 |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
211 |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
212 bool OrthancMoveRequestHandler::LookupIdentifiers(std::vector<std::string>& publicIds, |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
213 ResourceType level, |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
214 const DicomMap& input) |
619 | 215 { |
1724
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
216 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
|
217 |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
218 switch (level) |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
219 { |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
220 case ResourceType_Patient: |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
221 tag = DICOM_TAG_PATIENT_ID; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
222 break; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
223 |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
224 case ResourceType_Study: |
4165
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
225 // The test below using "IsNonEmptyTag()" fixes compatibility |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
226 // with Ambra C-FIND SCU: |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
227 // https://groups.google.com/g/orthanc-users/c/yIUnZ9v9-Zs/m/GQPXiAOiCQAJ |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
228 if (IsNonEmptyTag(input, DICOM_TAG_ACCESSION_NUMBER)) |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
229 { |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
230 tag = DICOM_TAG_ACCESSION_NUMBER; |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
231 } |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
232 else |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
233 { |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
234 tag = DICOM_TAG_STUDY_INSTANCE_UID; |
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
235 } |
1724
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
236 break; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
237 |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
238 case ResourceType_Series: |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
239 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
|
240 break; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
241 |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
242 case ResourceType_Instance: |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
243 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
|
244 break; |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
245 |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
246 default: |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
247 throw OrthancException(ErrorCode_ParameterOutOfRange); |
7e0b5e413c7c
C-Move SCP for studies using AccessionNumber tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
248 } |
1721
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
249 |
619 | 250 if (!input.HasTag(tag)) |
251 { | |
252 return false; | |
253 } | |
254 | |
1737
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
255 const DicomValue& value = input.GetValue(tag); |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
256 if (value.IsNull() || |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
257 value.IsBinary()) |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
258 { |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
259 return false; |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
260 } |
619 | 261 else |
262 { | |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
263 const std::string& content = value.GetContent(); |
3697
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
264 |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
265 /** |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
266 * This tokenization fixes issue 154 ("Matching against list of |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
267 * UID-s by C-MOVE"). |
4476
c1f36fd13730
migrate remaining links to issues in bitbucket to mercurial server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
268 * https://bugs.orthanc-server.com/show_bug.cgi?id=154 |
3697
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
269 **/ |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
270 |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
271 std::vector<std::string> tokens; |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
272 Toolbox::TokenizeString(tokens, content, '\\'); |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
273 for (size_t i = 0; i < tokens.size(); i++) |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
274 { |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
275 std::vector<std::string> matches; |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
276 context_.GetIndex().LookupIdentifierExact(matches, level, tag, tokens[i]); |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
277 |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
278 // Concatenate "publicIds" with "matches" |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
279 publicIds.insert(publicIds.end(), matches.begin(), matches.end()); |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
280 } |
5331918773e7
Fix issue #154 (Matching against list of UID-s by C-MOVE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
281 |
619 | 282 return true; |
283 } | |
284 } | |
285 | |
286 | |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
287 static IMoveRequestIterator* CreateIterator(ServerContext& context, |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
288 const std::string& targetAet, |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
289 const std::vector<std::string>& publicIds, |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
290 const std::string& originatorAet, |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
291 uint16_t originatorId) |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
292 { |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
293 if (publicIds.empty()) |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
294 { |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
295 throw OrthancException(ErrorCode_BadRequest, |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
296 "C-MOVE request matching no resource stored in Orthanc"); |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
297 } |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
298 |
2940
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
299 bool synchronous; |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
300 |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
301 { |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
302 OrthancConfiguration::ReaderLock lock; |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
303 synchronous = lock.GetConfiguration().GetBooleanParameter("SynchronousCMove", true); |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2932
diff
changeset
|
304 } |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
305 |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
306 if (synchronous) |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
307 { |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
308 return new SynchronousMove(context, targetAet, publicIds, originatorAet, originatorId); |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
309 } |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
310 else |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
311 { |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
312 return new AsynchronousMove(context, targetAet, publicIds, originatorAet, originatorId); |
2625
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
313 } |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
314 } |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
315 |
5469dda691cd
new configuration option: SynchronousCMove
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2624
diff
changeset
|
316 |
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
317 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
|
318 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
|
319 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
|
320 const std::string& originatorAet, |
1909
21fcfc428dc2
another semantics for Originator Message ID
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1907
diff
changeset
|
321 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
|
322 uint16_t originatorId) |
619 | 323 { |
3174
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3157
diff
changeset
|
324 MetricsRegistry::Timer timer(context_.GetMetricsRegistry(), "orthanc_move_scp_duration_ms"); |
8ea7c4546c3a
primitives to collect metrics in Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3157
diff
changeset
|
325 |
4806 | 326 CLOG(INFO, DICOM) << "Move-SCU request received for AET \"" << targetAet << "\""; |
619 | 327 |
1371
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
328 { |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
329 DicomArray query(input); |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
330 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
|
331 { |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
332 if (!query.GetElement(i).GetValue().IsNull()) |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
333 { |
4313
91554aecff9a
removed a friend method for better abi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4287
diff
changeset
|
334 CLOG(INFO, DICOM) << " (" << query.GetElement(i).GetTag().Format() |
91554aecff9a
removed a friend method for better abi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4287
diff
changeset
|
335 << ") " << FromDcmtkBridge::GetTagName(query.GetElement(i)) |
4376
b002f9abe802
review of changeset 4375:208029732d51
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4375
diff
changeset
|
336 << " = " << context_.GetDeidentifiedContent(query.GetElement(i)); |
1371
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
337 } |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
338 } |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
339 } |
f528849ee9f7
DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
340 |
619 | 341 /** |
342 * Retrieve the query level. | |
343 **/ | |
344 | |
345 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
|
346 |
1737
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
347 if (levelTmp == NULL || |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
348 levelTmp->IsNull() || |
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
349 levelTmp->IsBinary()) |
619 | 350 { |
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
351 // 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
|
352 // 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
|
353 // 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
|
354 // 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
|
355 // 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
|
356 |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
357 std::vector<std::string> publicIds; |
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
358 |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
359 if (LookupIdentifiers(publicIds, ResourceType_Instance, input) || |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
360 LookupIdentifiers(publicIds, ResourceType_Series, input) || |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
361 LookupIdentifiers(publicIds, ResourceType_Study, input) || |
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
362 LookupIdentifiers(publicIds, ResourceType_Patient, input)) |
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
363 { |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
364 return CreateIterator(context_, targetAet, publicIds, originatorAet, originatorId); |
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
365 } |
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
366 else |
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
367 { |
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
368 // No identifier is present in the request. |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
369 throw OrthancException(ErrorCode_BadRequest, "Invalid fields in a C-MOVE request"); |
1231
703fcd797186
Support of Tudor DICOM in Query/Retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1162
diff
changeset
|
370 } |
619 | 371 } |
372 | |
1721
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
373 assert(levelTmp != NULL); |
1737
ec66a16aa398
removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1724
diff
changeset
|
374 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
|
375 |
619 | 376 |
377 /** | |
378 * Lookup for the resource to be sent. | |
379 **/ | |
380 | |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
381 std::vector<std::string> publicIds; |
619 | 382 |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
383 if (LookupIdentifiers(publicIds, level, input)) |
619 | 384 { |
3301
6ce10c3b1eb7
Fix issue #131 (C-MOVE failure due to duplicate StudyInstanceUID in the database)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3174
diff
changeset
|
385 return CreateIterator(context_, targetAet, publicIds, originatorAet, originatorId); |
619 | 386 } |
1721
3bcb01028107
removed another flavor of ServerIndex::LookupIdentifier
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
387 else |
619 | 388 { |
4165
e34c89e89aac
Fix compatibility with C-MOVE SCU requests issued by Ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
389 throw OrthancException(ErrorCode_BadRequest, "No DICOM identifier provided in the C-MOVE request for this query retrieve level"); |
619 | 390 } |
391 } | |
392 } |