comparison OrthancServer/Sources/ServerJobs/DicomMoveScuJob.h @ 4740:c1d6ce00be3f openssl-3.x

integration mainline->openssl-3.x
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 06 Jul 2021 08:40:43 +0200
parents f0038043fb97 7826ac059c31
children 2e71a08eea15
comparison
equal deleted inserted replaced
4739:8cc9137b5c2e 4740:c1d6ce00be3f
38 class Unserializer; 38 class Unserializer;
39 39
40 ServerContext& context_; 40 ServerContext& context_;
41 DicomAssociationParameters parameters_; 41 DicomAssociationParameters parameters_;
42 std::string targetAet_; 42 std::string targetAet_;
43 Json::Value query_; 43 DicomFindAnswers query_;
44 DicomToJsonFormat queryFormat_; // New in 1.9.5
44 45
45 std::unique_ptr<DicomControlUserConnection> connection_; 46 std::unique_ptr<DicomControlUserConnection> connection_;
46 47
47 void Retrieve(const DicomMap& findAnswer); 48 void Retrieve(const DicomMap& findAnswer);
48 49
49 public: 50 public:
50 explicit DicomMoveScuJob(ServerContext& context) : 51 explicit DicomMoveScuJob(ServerContext& context) :
51 context_(context), 52 context_(context),
52 query_(Json::arrayValue) 53 query_(true /* this is for worklists */),
54 queryFormat_(DicomToJsonFormat_Short)
53 { 55 {
54 } 56 }
55 57
56 DicomMoveScuJob(ServerContext& context, 58 DicomMoveScuJob(ServerContext& context,
57 const Json::Value& serialized); 59 const Json::Value& serialized);
77 return targetAet_; 79 return targetAet_;
78 } 80 }
79 81
80 void SetTargetAet(const std::string& aet); 82 void SetTargetAet(const std::string& aet);
81 83
84 void SetQueryFormat(DicomToJsonFormat format);
85
86 DicomToJsonFormat GetQueryFormat() const
87 {
88 return queryFormat_;
89 }
90
82 virtual void Stop(JobStopReason reason) ORTHANC_OVERRIDE; 91 virtual void Stop(JobStopReason reason) ORTHANC_OVERRIDE;
83 92
84 virtual void GetJobType(std::string& target) ORTHANC_OVERRIDE 93 virtual void GetJobType(std::string& target) ORTHANC_OVERRIDE
85 { 94 {
86 target = "DicomMoveScu"; 95 target = "DicomMoveScu";