Mercurial > hg > orthanc
annotate OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.cpp @ 5658:4b7bc21db336
DicomTlsTrustedCertificates not required anymore for SCU when DicomTlsRemoteCertificateRequired is false
author | Alain Mazy <am@orthanc.team> |
---|---|
date | Tue, 18 Jun 2024 10:27:28 +0200 |
parents | f7adfb22e20e |
children |
rev | line source |
---|---|
2603 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
5640
f7adfb22e20e
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5485
diff
changeset
|
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
f7adfb22e20e
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5485
diff
changeset
|
6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
5485
48b8dae6dc77
upgrade to year 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
2603 | 8 * |
9 * This program is free software: you can redistribute it and/or | |
10 * modify it under the terms of the GNU General Public License as | |
11 * published by the Free Software Foundation, either version 3 of the | |
12 * License, or (at your option) any later version. | |
13 * | |
14 * This program is distributed in the hope that it will be useful, but | |
15 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
17 * General Public License for more details. | |
18 * | |
19 * You should have received a copy of the GNU General Public License | |
20 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
21 **/ | |
22 | |
23 | |
2641 | 24 #include "../../PrecompiledHeadersServer.h" |
2603 | 25 #include "StoreScuOperation.h" |
26 | |
27 #include "DicomInstanceOperationValue.h" | |
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3863
diff
changeset
|
28 #include "../../ServerContext.h" |
2603 | 29 |
4045 | 30 #include "../../../../OrthancFramework/Sources/Logging.h" |
31 #include "../../../../OrthancFramework/Sources/OrthancException.h" | |
32 #include "../../../../OrthancFramework/Sources/SerializationToolbox.h" | |
2603 | 33 |
34 namespace Orthanc | |
35 { | |
36 void StoreScuOperation::Apply(JobOperationValues& outputs, | |
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
37 const IJobOperationValue& input) |
2603 | 38 { |
3851
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
39 TimeoutDicomConnectionManager::Lock lock(connectionManager_, localAet_, modality_); |
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
40 |
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
41 if (input.GetType() != IJobOperationValue::Type_DicomInstance) |
2603 | 42 { |
43 throw OrthancException(ErrorCode_BadParameterType); | |
44 } | |
45 | |
2606
f2b9d3256060
SystemCallOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2605
diff
changeset
|
46 const DicomInstanceOperationValue& instance = |
f2b9d3256060
SystemCallOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2605
diff
changeset
|
47 dynamic_cast<const DicomInstanceOperationValue&>(input); |
2603 | 48 |
2605
1e11b0229e04
StorePeerOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
49 LOG(INFO) << "Lua: Sending instance " << instance.GetId() << " to modality \"" |
2603 | 50 << modality_.GetApplicationEntityTitle() << "\""; |
51 | |
52 try | |
53 { | |
54 std::string dicom; | |
2651
1da5a052c777
testing value serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2641
diff
changeset
|
55 instance.ReadDicom(dicom); |
3734
4fc24b69446a
triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3712
diff
changeset
|
56 |
4fc24b69446a
triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3712
diff
changeset
|
57 std::string sopClassUid, sopInstanceUid; // Unused |
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3863
diff
changeset
|
58 context_.StoreWithTranscoding(sopClassUid, sopInstanceUid, lock.GetConnection(), dicom, |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3863
diff
changeset
|
59 false /* Not a C-MOVE */, "", 0); |
2603 | 60 } |
61 catch (OrthancException& e) | |
62 { | |
2605
1e11b0229e04
StorePeerOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
63 LOG(ERROR) << "Lua: Unable to send instance " << instance.GetId() << " to modality \"" |
2603 | 64 << modality_.GetApplicationEntityTitle() << "\": " << e.What(); |
65 } | |
2609
f7a84b551ee4
switch Lua to new jobs engine
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
66 |
f7a84b551ee4
switch Lua to new jobs engine
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
67 outputs.Append(input.Clone()); |
2603 | 68 } |
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
69 |
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
70 |
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
71 void StoreScuOperation::Serialize(Json::Value& result) const |
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
72 { |
2654 | 73 result = Json::objectValue; |
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
74 result["Type"] = "StoreScu"; |
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
75 result["LocalAET"] = localAet_; |
2871
6eebc2eb3168
refactoring serialization of RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2659
diff
changeset
|
76 modality_.Serialize(result["Modality"], true /* force advanced format */); |
2655 | 77 } |
78 | |
79 | |
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3863
diff
changeset
|
80 StoreScuOperation::StoreScuOperation(ServerContext& context, |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3863
diff
changeset
|
81 TimeoutDicomConnectionManager& connectionManager, |
3851
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
82 const Json::Value& serialized) : |
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3863
diff
changeset
|
83 context_(context), |
3851
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
84 connectionManager_(connectionManager) |
2655 | 85 { |
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
86 if (SerializationToolbox::ReadString(serialized, "Type") != "StoreScu" || |
2655 | 87 !serialized.isMember("LocalAET")) |
88 { | |
89 throw OrthancException(ErrorCode_BadFileFormat); | |
90 } | |
91 | |
2659 | 92 localAet_ = SerializationToolbox::ReadString(serialized, "LocalAET"); |
2655 | 93 modality_ = RemoteModalityParameters(serialized["Modality"]); |
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
94 } |
2603 | 95 } |