Mercurial > hg > orthanc-dicomweb
changeset 668:8e50b0b45233
merged commits inadvertently pushed in 1.17 branch
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Mon, 26 Aug 2024 12:28:44 +0200 (8 months ago) |
| parents | 4646d296303e (current diff) ae2e3d4c54a2 (diff) |
| children | 2047b0921877 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- 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) =========================
--- 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_; + } };