Mercurial > hg > orthanc
annotate OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.cpp @ 4303:44b53a2c0a13
improving detection of ABI compatibility
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 06 Nov 2020 15:37:30 +0100 |
| parents | 05b8fd21089c |
| children | 2ae905070221 |
| 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" | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3863
diff
changeset
|
38 #include "../../ServerContext.h" |
| 2603 | 39 |
| 4045 | 40 #include "../../../../OrthancFramework/Sources/Logging.h" |
| 41 #include "../../../../OrthancFramework/Sources/OrthancException.h" | |
| 42 #include "../../../../OrthancFramework/Sources/SerializationToolbox.h" | |
| 2603 | 43 |
| 44 namespace Orthanc | |
| 45 { | |
| 46 void StoreScuOperation::Apply(JobOperationValues& outputs, | |
|
3851
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
47 const JobOperationValue& input) |
| 2603 | 48 { |
|
3851
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
49 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
|
50 |
| 2603 | 51 if (input.GetType() != JobOperationValue::Type_DicomInstance) |
| 52 { | |
| 53 throw OrthancException(ErrorCode_BadParameterType); | |
| 54 } | |
| 55 | |
|
2606
f2b9d3256060
SystemCallOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2605
diff
changeset
|
56 const DicomInstanceOperationValue& instance = |
|
f2b9d3256060
SystemCallOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2605
diff
changeset
|
57 dynamic_cast<const DicomInstanceOperationValue&>(input); |
| 2603 | 58 |
|
2605
1e11b0229e04
StorePeerOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
59 LOG(INFO) << "Lua: Sending instance " << instance.GetId() << " to modality \"" |
| 2603 | 60 << modality_.GetApplicationEntityTitle() << "\""; |
| 61 | |
| 62 try | |
| 63 { | |
| 64 std::string dicom; | |
|
2651
1da5a052c777
testing value serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2641
diff
changeset
|
65 instance.ReadDicom(dicom); |
|
3734
4fc24b69446a
triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3712
diff
changeset
|
66 |
|
4fc24b69446a
triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3712
diff
changeset
|
67 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
|
68 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
|
69 false /* Not a C-MOVE */, "", 0); |
| 2603 | 70 } |
| 71 catch (OrthancException& e) | |
| 72 { | |
|
2605
1e11b0229e04
StorePeerOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
73 LOG(ERROR) << "Lua: Unable to send instance " << instance.GetId() << " to modality \"" |
| 2603 | 74 << modality_.GetApplicationEntityTitle() << "\": " << e.What(); |
| 75 } | |
|
2609
f7a84b551ee4
switch Lua to new jobs engine
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
76 |
|
f7a84b551ee4
switch Lua to new jobs engine
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
77 outputs.Append(input.Clone()); |
| 2603 | 78 } |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
79 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
80 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
81 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
|
82 { |
| 2654 | 83 result = Json::objectValue; |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
84 result["Type"] = "StoreScu"; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
85 result["LocalAET"] = localAet_; |
|
2871
6eebc2eb3168
refactoring serialization of RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2659
diff
changeset
|
86 modality_.Serialize(result["Modality"], true /* force advanced format */); |
| 2655 | 87 } |
| 88 | |
| 89 | |
|
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3863
diff
changeset
|
90 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
|
91 TimeoutDicomConnectionManager& connectionManager, |
|
3851
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
92 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
|
93 context_(context), |
|
3851
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
94 connectionManager_(connectionManager) |
| 2655 | 95 { |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
96 if (SerializationToolbox::ReadString(serialized, "Type") != "StoreScu" || |
| 2655 | 97 !serialized.isMember("LocalAET")) |
| 98 { | |
| 99 throw OrthancException(ErrorCode_BadFileFormat); | |
| 100 } | |
| 101 | |
| 2659 | 102 localAet_ = SerializationToolbox::ReadString(serialized, "LocalAET"); |
| 2655 | 103 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
|
104 } |
| 2603 | 105 } |