Mercurial > hg > orthanc
annotate OrthancServer/ServerJobs/Operations/StoreScuOperation.cpp @ 3850:d729d6e8b484
removing useless abstraction IDicomConnectionManager
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 20 Apr 2020 14:45:21 +0200 |
| parents | 4fc24b69446a |
| children | 6498739a3c3c |
| 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 | |
|
3640
94f4a18a79cc
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 2603 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 11 * | |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 23 * | |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
| 2641 | 34 #include "../../PrecompiledHeadersServer.h" |
| 2603 | 35 #include "StoreScuOperation.h" |
| 36 | |
| 37 #include "DicomInstanceOperationValue.h" | |
| 38 | |
| 2641 | 39 #include "../../../Core/Logging.h" |
| 40 #include "../../../Core/OrthancException.h" | |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
41 #include "../../../Core/SerializationToolbox.h" |
| 2603 | 42 |
| 43 namespace Orthanc | |
| 44 { | |
| 45 void StoreScuOperation::Apply(JobOperationValues& outputs, | |
|
2608
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
46 const JobOperationValue& input, |
|
3850
d729d6e8b484
removing useless abstraction IDicomConnectionManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3734
diff
changeset
|
47 TimeoutDicomConnectionManager& connectionManager) |
| 2603 | 48 { |
|
3850
d729d6e8b484
removing useless abstraction IDicomConnectionManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3734
diff
changeset
|
49 std::unique_ptr<TimeoutDicomConnectionManager::Resource> resource |
|
2608
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
50 (connectionManager.AcquireConnection(localAet_, modality_)); |
| 2603 | 51 |
| 52 if (resource.get() == NULL) | |
| 53 { | |
|
2605
1e11b0229e04
StorePeerOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
54 LOG(ERROR) << "Lua: Cannot connect to modality: " << modality_.GetApplicationEntityTitle(); |
| 2603 | 55 return; |
| 56 } | |
| 57 | |
| 58 if (input.GetType() != JobOperationValue::Type_DicomInstance) | |
| 59 { | |
| 60 throw OrthancException(ErrorCode_BadParameterType); | |
| 61 } | |
| 62 | |
|
2606
f2b9d3256060
SystemCallOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2605
diff
changeset
|
63 const DicomInstanceOperationValue& instance = |
|
f2b9d3256060
SystemCallOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2605
diff
changeset
|
64 dynamic_cast<const DicomInstanceOperationValue&>(input); |
| 2603 | 65 |
|
2605
1e11b0229e04
StorePeerOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
66 LOG(INFO) << "Lua: Sending instance " << instance.GetId() << " to modality \"" |
| 2603 | 67 << modality_.GetApplicationEntityTitle() << "\""; |
| 68 | |
| 69 try | |
| 70 { | |
| 71 std::string dicom; | |
|
2651
1da5a052c777
testing value serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2641
diff
changeset
|
72 instance.ReadDicom(dicom); |
|
3734
4fc24b69446a
triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3712
diff
changeset
|
73 |
|
4fc24b69446a
triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3712
diff
changeset
|
74 std::string sopClassUid, sopInstanceUid; // Unused |
|
4fc24b69446a
triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3712
diff
changeset
|
75 resource->GetConnection().Store(sopClassUid, sopInstanceUid, dicom); |
| 2603 | 76 } |
| 77 catch (OrthancException& e) | |
| 78 { | |
|
2605
1e11b0229e04
StorePeerOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
79 LOG(ERROR) << "Lua: Unable to send instance " << instance.GetId() << " to modality \"" |
| 2603 | 80 << modality_.GetApplicationEntityTitle() << "\": " << e.What(); |
| 81 } | |
|
2609
f7a84b551ee4
switch Lua to new jobs engine
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
82 |
|
f7a84b551ee4
switch Lua to new jobs engine
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
83 outputs.Append(input.Clone()); |
| 2603 | 84 } |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
85 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
86 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
87 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
|
88 { |
| 2654 | 89 result = Json::objectValue; |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
90 result["Type"] = "StoreScu"; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
91 result["LocalAET"] = localAet_; |
|
2871
6eebc2eb3168
refactoring serialization of RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2659
diff
changeset
|
92 modality_.Serialize(result["Modality"], true /* force advanced format */); |
| 2655 | 93 } |
| 94 | |
| 95 | |
| 96 StoreScuOperation::StoreScuOperation(const Json::Value& serialized) | |
| 97 { | |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
98 if (SerializationToolbox::ReadString(serialized, "Type") != "StoreScu" || |
| 2655 | 99 !serialized.isMember("LocalAET")) |
| 100 { | |
| 101 throw OrthancException(ErrorCode_BadFileFormat); | |
| 102 } | |
| 103 | |
| 2659 | 104 localAet_ = SerializationToolbox::ReadString(serialized, "LocalAET"); |
| 2655 | 105 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
|
106 } |
| 2603 | 107 } |