# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1654701073 -7200
# Node ID 9708addb5a87f87fb0f4aeb8d1872dad6ff1749d
# Parent  49e9245b4005887c40ab1ffc720b4a062a02f027
added 'Resources' and 'Originator' in the jobs 'Content'

diff -r 49e9245b4005 -r 9708addb5a87 .hgignore
--- /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/
diff -r 49e9245b4005 -r 9708addb5a87 Framework/PullMode/PullJob.cpp
--- 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()));
     }
diff -r 49e9245b4005 -r 9708addb5a87 Framework/PushMode/PushJob.cpp
--- 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()));
diff -r 49e9245b4005 -r 9708addb5a87 NEWS
--- 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