Mercurial > hg > orthanc

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerJobs/DicomMoveScuJob.h	Tue Jul 06 08:36:54 2021 +0200
+++ b/OrthancServer/Sources/ServerJobs/DicomMoveScuJob.h	Tue Jul 06 08:40:43 2021 +0200
@@ -40,7 +40,8 @@
     ServerContext&              context_;
     DicomAssociationParameters  parameters_;
     std::string                 targetAet_;
-    Json::Value                 query_;
+    DicomFindAnswers            query_;
+    DicomToJsonFormat           queryFormat_;  // New in 1.9.5
 
     std::unique_ptr<DicomControlUserConnection>  connection_;
     
@@ -49,7 +50,8 @@
   public:
     explicit DicomMoveScuJob(ServerContext& context) :
       context_(context),
-      query_(Json::arrayValue)
+      query_(true /* this is for worklists */),
+      queryFormat_(DicomToJsonFormat_Short)
     {
     }
 
@@ -79,6 +81,13 @@
     
     void SetTargetAet(const std::string& aet);
 
+    void SetQueryFormat(DicomToJsonFormat format);
+
+    DicomToJsonFormat GetQueryFormat() const
+    {
+      return queryFormat_;
+    }
+
     virtual void Stop(JobStopReason reason) ORTHANC_OVERRIDE;
 
     virtual void GetJobType(std::string& target) ORTHANC_OVERRIDE