Mercurial > hg > orthanc

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ResourceModificationJob
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 28 May 2018 16:30:17 +0200
parents 714dcddeb65f
children a21b244efb37
comparison
equal deleted inserted replaced
2639:75a404e40323 2640:c691fcf66071
49 } 49 }
50 50
51 51
52 bool DicomModalityStoreJob::HandleInstance(const std::string& instance) 52 bool DicomModalityStoreJob::HandleInstance(const std::string& instance)
53 { 53 {
54 assert(IsStarted());
54 OpenConnection(); 55 OpenConnection();
55 56
56 LOG(INFO) << "Sending instance " << instance << " to modality \"" 57 LOG(INFO) << "Sending instance " << instance << " to modality \""
57 << remote_.GetApplicationEntityTitle() << "\""; 58 << remote_.GetApplicationEntityTitle() << "\"";
58 59
168 } 169 }
169 170
170 171
171 void DicomModalityStoreJob::GetPublicContent(Json::Value& value) 172 void DicomModalityStoreJob::GetPublicContent(Json::Value& value)
172 { 173 {
173 value["Description"] = GetDescription(); 174 SetOfInstancesJob::GetPublicContent(value);
175
174 value["LocalAet"] = localAet_; 176 value["LocalAet"] = localAet_;
175 value["RemoteAet"] = remote_.GetApplicationEntityTitle(); 177 value["RemoteAet"] = remote_.GetApplicationEntityTitle();
176 178
177 if (HasMoveOriginator()) 179 if (HasMoveOriginator())
178 { 180 {
179 value["MoveOriginatorAET"] = GetMoveOriginatorAet(); 181 value["MoveOriginatorAET"] = GetMoveOriginatorAet();
180 value["MoveOriginatorID"] = GetMoveOriginatorId(); 182 value["MoveOriginatorID"] = GetMoveOriginatorId();
181 } 183 }
182
183 value["InstancesCount"] = static_cast<uint32_t>(GetInstances().size());
184 value["FailedInstancesCount"] = static_cast<uint32_t>(GetFailedInstances().size());
185 } 184 }
186 } 185 }