Mercurial > hg > orthanc
annotate OrthancServer/Scheduler/StoreScuCommand.cpp @ 2222:21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 13 Dec 2016 14:34:33 +0100 |
parents | 2b1520efa282 |
children | a3a65de1840f |
rev | line source |
---|---|
999 | 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:
1165
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
999 | 5 * |
6 * This program is free software: you can redistribute it and/or | |
7 * modify it under the terms of the GNU General Public License as | |
8 * published by the Free Software Foundation, either version 3 of the | |
9 * License, or (at your option) any later version. | |
10 * | |
11 * In addition, as a special exception, the copyright holders of this | |
12 * program give permission to link the code of its release with the | |
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
14 * that use the same license as the "OpenSSL" library), and distribute | |
15 * the linked executables. You must obey the GNU General Public License | |
16 * in all respects for all of the code used other than "OpenSSL". If you | |
17 * modify file(s) with this exception, you may extend this exception to | |
18 * your version of the file(s), but you are not obligated to do so. If | |
19 * you do not wish to do so, delete this exception statement from your | |
20 * version. If you delete this exception statement from all source files | |
21 * in the program, then also delete it here. | |
22 * | |
23 * This program is distributed in the hope that it will be useful, but | |
24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
26 * General Public License for more details. | |
27 * | |
28 * You should have received a copy of the GNU General Public License | |
29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
30 **/ | |
31 | |
32 | |
1624
0a2ad4a6858f
fix missing precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
33 #include "../PrecompiledHeadersServer.h" |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
999
diff
changeset
|
34 #include "StoreScuCommand.h" |
999 | 35 |
1486
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1427
diff
changeset
|
36 #include "../../Core/Logging.h" |
999 | 37 |
38 namespace Orthanc | |
39 { | |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
999
diff
changeset
|
40 StoreScuCommand::StoreScuCommand(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:
1288
diff
changeset
|
41 const std::string& localAet, |
1165
0561f2087cc9
Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1099
diff
changeset
|
42 const RemoteModalityParameters& modality, |
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
43 bool ignoreExceptions) : |
999 | 44 context_(context), |
1165
0561f2087cc9
Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1099
diff
changeset
|
45 modality_(modality), |
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:
1288
diff
changeset
|
46 ignoreExceptions_(ignoreExceptions), |
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
|
47 localAet_(localAet), |
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
48 moveOriginatorID_(0) |
999 | 49 { |
50 } | |
51 | |
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
52 |
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
53 void StoreScuCommand::SetMoveOriginator(const std::string& aet, |
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
54 uint16_t id) |
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
55 { |
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
56 moveOriginatorAET_ = aet; |
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
57 moveOriginatorID_ = id; |
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
58 } |
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
59 |
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
60 |
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
999
diff
changeset
|
61 bool StoreScuCommand::Apply(ListOfStrings& outputs, |
999 | 62 const ListOfStrings& inputs) |
63 { | |
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:
1288
diff
changeset
|
64 ReusableDicomUserConnection::Locker locker(context_.GetReusableDicomUserConnection(), localAet_, modality_); |
999 | 65 |
66 for (ListOfStrings::const_iterator | |
67 it = inputs.begin(); it != inputs.end(); ++it) | |
68 { | |
69 LOG(INFO) << "Sending resource " << *it << " to modality \"" | |
70 << modality_.GetApplicationEntityTitle() << "\""; | |
71 | |
1099
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
72 try |
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
73 { |
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
74 std::string dicom; |
2124 | 75 context_.ReadDicom(dicom, *it); |
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
|
76 |
2222
21713ce8717b
Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2124
diff
changeset
|
77 locker.GetConnection().Store(dicom, moveOriginatorAET_, moveOriginatorID_); |
1001
f3929718ea7e
autorouting primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
78 |
1099
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
79 // Only chain with other commands if this command succeeds |
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
80 outputs.push_back(*it); |
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
81 } |
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
82 catch (OrthancException& e) |
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
83 { |
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
84 // Ignore transmission errors (e.g. if the remote modality is |
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
85 // powered off) |
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
86 LOG(ERROR) << "Unable to forward to a modality in a Lua script (instance " |
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
87 << *it << "): " << e.What(); |
1165
0561f2087cc9
Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1099
diff
changeset
|
88 |
0561f2087cc9
Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1099
diff
changeset
|
89 if (!ignoreExceptions_) |
0561f2087cc9
Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1099
diff
changeset
|
90 { |
0561f2087cc9
Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1099
diff
changeset
|
91 throw; |
0561f2087cc9
Fix reporting of errors in Orthanc Explorer when sending images to peers/modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1099
diff
changeset
|
92 } |
1099
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1007
diff
changeset
|
93 } |
999 | 94 } |
95 | |
96 return true; | |
97 } | |
98 } |