Mercurial > hg > orthanc
diff OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp @ 4729:4e2247df6327
Added "Short" and "Full" options in /modalities/id/find-worklist
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 25 Jun 2021 10:41:35 +0200 |
| parents | d9473bd5ed43 |
| children | 7826ac059c31 |
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp Fri Jun 25 09:12:49 2021 +0200 +++ b/OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp Fri Jun 25 10:41:35 2021 +0200 @@ -203,11 +203,24 @@ } + void DicomMoveScuJob::SetQueryFormat(DicomToJsonFormat format) + { + if (IsStarted()) + { + throw OrthancException(ErrorCode_BadSequenceOfCalls); + } + else + { + queryFormat_ = format; + } + } + + void DicomMoveScuJob::GetPublicContent(Json::Value& value) { SetOfCommandsJob::GetPublicContent(value); - value["LocalAet"] = parameters_.GetLocalApplicationEntityTitle(); + value[LOCAL_AET] = parameters_.GetLocalApplicationEntityTitle(); value["RemoteAet"] = parameters_.GetRemoteModality().GetApplicationEntityTitle(); value["Query"] = query_; } @@ -219,7 +232,8 @@ context_(context), parameters_(DicomAssociationParameters::UnserializeJob(serialized)), targetAet_(SerializationToolbox::ReadString(serialized, TARGET_AET)), - query_(Json::arrayValue) + query_(Json::arrayValue), + queryFormat_(DicomToJsonFormat_Short) { if (serialized.isMember(QUERY) && serialized[QUERY].type() == Json::arrayValue)