Mercurial > hg > orthanc-transfers
changeset 37:9708addb5a87
added 'Resources' and 'Originator' in the jobs 'Content'
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Wed, 08 Jun 2022 17:11:13 +0200 |
| parents | 49e9245b4005 |
| children | 2f338445712b f627882388dc |
| files | .hgignore Framework/PullMode/PullJob.cpp Framework/PushMode/PushJob.cpp NEWS |
| diffstat | 4 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Wed Jun 08 17:11:13 2022 +0200 @@ -0,0 +1,7 @@ +syntax: glob +ThirdPartyDownloads/ +CMakeLists.txt.user +*.cpp.orig +*.h.orig +*~ +.vscode/
--- a/Framework/PullMode/PullJob.cpp Wed Jun 23 09:06:30 2021 +0200 +++ b/Framework/PullMode/PullJob.cpp Wed Jun 08 17:11:13 2022 +0200 @@ -161,6 +161,11 @@ job_(job), info_(info) { + if (job_.query_.HasOriginator()) + { + info_.SetContent("Originator", job_.query_.GetOriginator()); + } + info_.SetContent("Resources", job_.query_.GetResources()); info_.SetContent("Peer", job_.query_.GetPeer()); info_.SetContent("Compression", EnumerationToString(job_.query_.GetCompression())); }
--- a/Framework/PushMode/PushJob.cpp Wed Jun 23 09:06:30 2021 +0200 +++ b/Framework/PushMode/PushJob.cpp Wed Jun 08 17:11:13 2022 +0200 @@ -202,6 +202,7 @@ Orthanc::Toolbox::WriteFastJson(createTransaction_, push); + info_.SetContent("Resources", job_.query_.GetResources()); info_.SetContent("Peer", job_.query_.GetPeer()); info_.SetContent("Compression", EnumerationToString(job_.query_.GetCompression())); info_.SetContent("TotalInstances", static_cast<unsigned int>(scheduler.GetInstancesCount()));
--- a/NEWS Wed Jun 23 09:06:30 2021 +0200 +++ b/NEWS Wed Jun 08 17:11:13 2022 +0200 @@ -1,6 +1,8 @@ Pending changes in the mainline =============================== +* Added "Resources" and "Originator" in the jobs "Content". "Resources" + is copied directly from the query that created the job. * Support of dynamic linking against the system-wide Orthanc framework library