diff OrthancServer/ServerJobs/DicomModalityStoreJob.cpp @ 2640:c691fcf66071 jobs

ResourceModificationJob
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 28 May 2018 16:30:17 +0200
parents 714dcddeb65f
children a21b244efb37
line wrap: on
line diff
--- a/OrthancServer/ServerJobs/DicomModalityStoreJob.cpp	Mon May 28 14:39:22 2018 +0200
+++ b/OrthancServer/ServerJobs/DicomModalityStoreJob.cpp	Mon May 28 16:30:17 2018 +0200
@@ -51,6 +51,7 @@
 
   bool DicomModalityStoreJob::HandleInstance(const std::string& instance)
   {
+    assert(IsStarted());
     OpenConnection();
 
     LOG(INFO) << "Sending instance " << instance << " to modality \"" 
@@ -170,7 +171,8 @@
 
   void DicomModalityStoreJob::GetPublicContent(Json::Value& value)
   {
-    value["Description"] = GetDescription();
+    SetOfInstancesJob::GetPublicContent(value);
+    
     value["LocalAet"] = localAet_;
     value["RemoteAet"] = remote_.GetApplicationEntityTitle();
 
@@ -179,8 +181,5 @@
       value["MoveOriginatorAET"] = GetMoveOriginatorAet();
       value["MoveOriginatorID"] = GetMoveOriginatorId();
     }
-
-    value["InstancesCount"] = static_cast<uint32_t>(GetInstances().size());
-    value["FailedInstancesCount"] = static_cast<uint32_t>(GetFailedInstances().size());
   }
 }