# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1724668124 -7200
# Node ID 8e50b0b45233dc1e4e6f1f9728bb97db9bc03220
# Parent  4646d296303ebfbb101305a757c871cf265f70bd# Parent  ae2e3d4c54a254e2c09824c3e38d0b78086a2159
merged commits inadvertently pushed in 1.17 branch

diff -r 4646d296303e -r 8e50b0b45233 NEWS
--- a/NEWS	Wed Jun 26 16:26:28 2024 +0200
+++ b/NEWS	Mon Aug 26 12:28:44 2024 +0200
@@ -1,6 +1,8 @@
 Pending changes in the mainline
 ===============================
 
+* Added a "Server" entry in the DICOMWeb job content.
+
 
 Version 1.17 (2024-06-05)
 =========================
diff -r 4646d296303e -r 8e50b0b45233 Plugin/DicomWebClient.cpp
--- a/Plugin/DicomWebClient.cpp	Wed Jun 26 16:26:28 2024 +0200
+++ b/Plugin/DicomWebClient.cpp	Mon Aug 26 12:28:44 2024 +0200
@@ -501,26 +501,8 @@
 }
 
 
-// static void AddResourceForJobContent(Json::Value resourcesForJobContent /* out */, const char* resourceType, const std::string& resourceId)
 static void AddResourceForJobContent(Json::Value& resourcesForJobContent /* out */, Orthanc::ResourceType resourceType, const std::string& resourceId)
 {
-  // const char* resourceGroup = "Instances";
-  // if (resourceType == "Study")
-  // {
-  //   resourceGroup = "Studies";
-  // }
-  // else if (resourceType == "Series")
-  // {
-  //   resourceGroup = "Series";
-  // }
-  // else if (resourceType == "Patient")
-  // {
-  //   resourceGroup = "Patients";
-  // }
-  // else if (resourceType == "Instance")
-  // {
-  //   resourceGroup = "Instances";
-  // }
   const char* resourceGroup = Orthanc::GetResourceTypeText(resourceType, true, true);
 
   if (!resourcesForJobContent.isMember(resourceGroup))
@@ -745,6 +727,7 @@
         boost::mutex::scoped_lock lock(that_.mutex_);
         context.SetContent("InstancesCount", boost::lexical_cast<std::string>(that_.instances_.size()));
         context.SetContent("Resources", that_.GetResourcesForJobContent());
+        context.SetContent("Server", that_.GetServerName());
         serverName = that_.serverName_;
         
         startPosition = that_.position_;        
@@ -889,6 +872,11 @@
   {
     return resourcesForJobContent_;
   }
+
+  const std::string& GetServerName()
+  {
+    return serverName_;
+  }
 };