changeset 6423:9612aa45134f default tip

RetrieveJob error payload
author Alain Mazy <am@orthanc.team>
date Mon, 17 Nov 2025 12:08:30 +0100
parents c557f6bdcbfd
children
files OrthancFramework/Sources/Enumerations.cpp OrthancFramework/Sources/Enumerations.h OrthancServer/Sources/ServerJobs/DicomRetrieveScuBaseJob.cpp
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/Enumerations.cpp	Sat Nov 15 11:49:39 2025 +0100
+++ b/OrthancFramework/Sources/Enumerations.cpp	Mon Nov 17 12:08:30 2025 +0100
@@ -1199,6 +1199,9 @@
       case ErrorPayloadType_Dimse:
         return "Dimse";
 
+      case ErrorPayloadType_RetrieveJob:
+        return "RetrieveJob";
+
       default:
         throw OrthancException(ErrorCode_ParameterOutOfRange);
     }
@@ -1932,6 +1935,10 @@
     {
       return ErrorPayloadType_Dimse;
     }
+    else if (type == "RetrieveJob")
+    {
+      return ErrorPayloadType_RetrieveJob;
+    }
     else
     {
       throw OrthancException(ErrorCode_ParameterOutOfRange);
--- a/OrthancFramework/Sources/Enumerations.h	Sat Nov 15 11:49:39 2025 +0100
+++ b/OrthancFramework/Sources/Enumerations.h	Mon Nov 17 12:08:30 2025 +0100
@@ -805,7 +805,8 @@
   enum ErrorPayloadType
   {
     ErrorPayloadType_None = 1,
-    ErrorPayloadType_Dimse = 2
+    ErrorPayloadType_Dimse = 2,
+    ErrorPayloadType_RetrieveJob = 3,
   };
 
 
--- a/OrthancServer/Sources/ServerJobs/DicomRetrieveScuBaseJob.cpp	Sat Nov 15 11:49:39 2025 +0100
+++ b/OrthancServer/Sources/ServerJobs/DicomRetrieveScuBaseJob.cpp	Mon Nov 17 12:08:30 2025 +0100
@@ -380,6 +380,6 @@
     Json::Value publicContent;
     GetPublicContent(publicContent);
 
-    payload.SetContent(ErrorPayloadType_Dimse, publicContent["Details"]);
+    payload.SetContent(ErrorPayloadType_RetrieveJob, publicContent["Details"]);
   }
 }