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