Mercurial > hg > orthanc

comparison OrthancServer/ServerJobs/Operations/StoreScuOperation.cpp @ 3920:82e88ff003d7 c-get

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> c-get
author Alain Mazy <alain@mazy.be>
date Tue, 12 May 2020 14:58:24 +0200
parents 8f7ad4989fec
children
comparison
equal deleted inserted replaced
3918:dba48c162b7b 3920:82e88ff003d7
33 33
34 #include "../../PrecompiledHeadersServer.h" 34 #include "../../PrecompiledHeadersServer.h"
35 #include "StoreScuOperation.h" 35 #include "StoreScuOperation.h"
36 36
37 #include "DicomInstanceOperationValue.h" 37 #include "DicomInstanceOperationValue.h"
38 #include "../../ServerContext.h"
38 39
39 #include "../../../Core/Logging.h" 40 #include "../../../Core/Logging.h"
40 #include "../../../Core/OrthancException.h" 41 #include "../../../Core/OrthancException.h"
41 #include "../../../Core/SerializationToolbox.h" 42 #include "../../../Core/SerializationToolbox.h"
42 43
62 { 63 {
63 std::string dicom; 64 std::string dicom;
64 instance.ReadDicom(dicom); 65 instance.ReadDicom(dicom);
65 66
66 std::string sopClassUid, sopInstanceUid; // Unused 67 std::string sopClassUid, sopInstanceUid; // Unused
67 lock.GetConnection().Store(sopClassUid, sopInstanceUid, dicom); 68 context_.StoreWithTranscoding(sopClassUid, sopInstanceUid, lock.GetConnection(), dicom,
69 false /* Not a C-MOVE */, "", 0);
68 } 70 }
69 catch (OrthancException& e) 71 catch (OrthancException& e)
70 { 72 {
71 LOG(ERROR) << "Lua: Unable to send instance " << instance.GetId() << " to modality \"" 73 LOG(ERROR) << "Lua: Unable to send instance " << instance.GetId() << " to modality \""
72 << modality_.GetApplicationEntityTitle() << "\": " << e.What(); 74 << modality_.GetApplicationEntityTitle() << "\": " << e.What();
83 result["LocalAET"] = localAet_; 85 result["LocalAET"] = localAet_;
84 modality_.Serialize(result["Modality"], true /* force advanced format */); 86 modality_.Serialize(result["Modality"], true /* force advanced format */);
85 } 87 }
86 88
87 89
88 StoreScuOperation::StoreScuOperation(TimeoutDicomConnectionManager& connectionManager, 90 StoreScuOperation::StoreScuOperation(ServerContext& context,
91 TimeoutDicomConnectionManager& connectionManager,
89 const Json::Value& serialized) : 92 const Json::Value& serialized) :
93 context_(context),
90 connectionManager_(connectionManager) 94 connectionManager_(connectionManager)
91 { 95 {
92 if (SerializationToolbox::ReadString(serialized, "Type") != "StoreScu" || 96 if (SerializationToolbox::ReadString(serialized, "Type") != "StoreScu" ||
93 !serialized.isMember("LocalAET")) 97 !serialized.isMember("LocalAET"))
94 { 98 {