Mercurial > hg > orthanc-dicomweb

changeset 80:99d70e054ee4 refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removal of macros for backward compatibility
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 08 Dec 2015 17:24:44 +0100
parents b94be2417215
children e7b1d5bca3ff 031f34284a78
files Plugin/Configuration.cpp Plugin/Configuration.h Plugin/Dicom.cpp Plugin/Plugin.cpp Plugin/QidoRs.cpp Plugin/QidoRs.h Plugin/StowRs.cpp Plugin/StowRs.h Plugin/Wado.cpp Plugin/Wado.h Plugin/WadoRs.cpp Plugin/WadoRs.h
diffstat 12 files changed, 183 insertions(+), 195 deletions(-) [+]
line wrap: on
line diff
--- a/Plugin/Configuration.cpp	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/Configuration.cpp	Tue Dec 08 17:24:44 2015 +0100
@@ -225,9 +225,9 @@
 
 
   bool RestApiPostJson(Json::Value& result,
-                      OrthancPluginContext* context,
-                      const std::string& uri,
-                      const std::string& body)
+                       OrthancPluginContext* context,
+                       const std::string& uri,
+                       const std::string& body)
   {
     std::string content;
     RestApiPostString(content, context, uri, body);
--- a/Plugin/Configuration.h	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/Configuration.h	Tue Dec 08 17:24:44 2015 +0100
@@ -23,18 +23,6 @@
 #include <orthanc/OrthancCPlugin.h>
 #include <json/value.h>
 
-#if (ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER <= 0 && ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER <= 9 && ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER <= 4)
-#  define REST_RETURN_TYPE     int32_t
-#  define REST_RETURN_SUCCESS  0
-#  define REST_RETURN_FAILURE  -1
-#  define HAS_ERROR_CODE       0
-#else
-#  define REST_RETURN_TYPE     OrthancPluginErrorCode
-#  define REST_RETURN_SUCCESS  OrthancPluginErrorCode_Success
-#  define REST_RETURN_FAILURE  OrthancPluginErrorCode_Plugin
-#  define HAS_ERROR_CODE       1
-#endif
-
 
 namespace OrthancPlugins
 {
--- a/Plugin/Dicom.cpp	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/Dicom.cpp	Tue Dec 08 17:24:44 2015 +0100
@@ -219,18 +219,18 @@
     return (//vr == "FL" ||
             //vr == "FD" ||
             //vr == "IS" ||
-            vr == "LT" ||
-            vr == "OB" ||
-            vr == "OD" ||
-            vr == "OF" ||
-            vr == "OW" ||
-            //vr == "SL" ||
-            //vr == "SS" ||
-            //vr == "ST" ||
-            //vr == "UL" ||
-            vr == "UN" ||
-            //vr == "US" ||
-            vr == "UT");
+      vr == "LT" ||
+      vr == "OB" ||
+      vr == "OD" ||
+      vr == "OF" ||
+      vr == "OW" ||
+      //vr == "SL" ||
+      //vr == "SS" ||
+      //vr == "ST" ||
+      //vr == "UL" ||
+      vr == "UN" ||
+      //vr == "US" ||
+      vr == "UT");
   }
 
 
--- a/Plugin/Plugin.cpp	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/Plugin.cpp	Tue Dec 08 17:24:44 2015 +0100
@@ -39,9 +39,9 @@
 const gdcm::Dict* dictionary_ = NULL;
 
 
-static REST_RETURN_TYPE SwitchStudies(OrthancPluginRestOutput* output,
-                                      const char* url,
-                                      const OrthancPluginHttpRequest* request)
+static OrthancPluginErrorCode SwitchStudies(OrthancPluginRestOutput* output,
+                                            const char* url,
+                                            const OrthancPluginHttpRequest* request)
 {
   switch (request->method)
   {
@@ -55,14 +55,14 @@
 
     default:
       OrthancPluginSendMethodNotAllowed(context_, output, "GET,POST");
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
   }
 }
 
 
-static REST_RETURN_TYPE SwitchStudy(OrthancPluginRestOutput* output,
-                                    const char* url,
-                                    const OrthancPluginHttpRequest* request)
+static OrthancPluginErrorCode SwitchStudy(OrthancPluginRestOutput* output,
+                                          const char* url,
+                                          const OrthancPluginHttpRequest* request)
 {
   switch (request->method)
   {
@@ -76,7 +76,7 @@
 
     default:
       OrthancPluginSendMethodNotAllowed(context_, output, "GET,POST");
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
   }
 }
 
--- a/Plugin/QidoRs.cpp	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/QidoRs.cpp	Tue Dec 08 17:24:44 2015 +0100
@@ -104,7 +104,7 @@
         throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
       }
 
-     if (key.size() == 8 &&
+      if (key.size() == 8 &&
           isxdigit(key[0]) &&
           isxdigit(key[1]) &&
           isxdigit(key[2]) &&
@@ -208,11 +208,11 @@
 
   public:
     ModuleMatcher(const OrthancPluginHttpRequest* request) :
-      dictionary_(gdcm::Global::GetInstance().GetDicts().GetPublicDict()),
-      fuzzy_(false),
-      offset_(0),
-      limit_(0),
-      includeAllFields_(false)
+    dictionary_(gdcm::Global::GetInstance().GetDicts().GetPublicDict()),
+    fuzzy_(false),
+    offset_(0),
+    limit_(0),
+    includeAllFields_(false)
     {
       for (uint32_t i = 0; i < request->getCount; i++)
       {
@@ -461,51 +461,51 @@
 
 
 
-REST_RETURN_TYPE SearchForStudies(OrthancPluginRestOutput* output,
-                                  const char* url,
-                                  const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode SearchForStudies(OrthancPluginRestOutput* output,
+                                        const char* url,
+                                        const OrthancPluginHttpRequest* request)
 {
   try
   {
     if (request->method != OrthancPluginHttpMethod_Get)
     {
       OrthancPluginSendMethodNotAllowed(context_, output, "GET");
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
     ModuleMatcher matcher(request);
     ApplyMatcher(output, request, matcher, QueryLevel_Study);
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (boost::bad_lexical_cast& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
 
 
-REST_RETURN_TYPE SearchForSeries(OrthancPluginRestOutput* output,
-                                 const char* url,
-                                 const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode SearchForSeries(OrthancPluginRestOutput* output,
+                                       const char* url,
+                                       const OrthancPluginHttpRequest* request)
 {
   try
   {
     if (request->method != OrthancPluginHttpMethod_Get)
     {
       OrthancPluginSendMethodNotAllowed(context_, output, "GET");
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
     ModuleMatcher matcher(request);
@@ -518,36 +518,36 @@
 
     ApplyMatcher(output, request, matcher, QueryLevel_Series);
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (boost::bad_lexical_cast& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
 
 
-REST_RETURN_TYPE SearchForInstances(OrthancPluginRestOutput* output,
-                                    const char* url,
-                                    const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode SearchForInstances(OrthancPluginRestOutput* output,
+                                          const char* url,
+                                          const OrthancPluginHttpRequest* request)
 {
   try
   {
     if (request->method != OrthancPluginHttpMethod_Get)
     {
       OrthancPluginSendMethodNotAllowed(context_, output, "GET");
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
     ModuleMatcher matcher(request);
@@ -566,21 +566,21 @@
 
     ApplyMatcher(output, request, matcher, QueryLevel_Instance);
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (boost::bad_lexical_cast& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
--- a/Plugin/QidoRs.h	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/QidoRs.h	Tue Dec 08 17:24:44 2015 +0100
@@ -23,14 +23,14 @@
 #include "Configuration.h"
 
 
-REST_RETURN_TYPE SearchForStudies(OrthancPluginRestOutput* output,
-                                  const char* url,
-                                  const OrthancPluginHttpRequest* request);
+OrthancPluginErrorCode SearchForStudies(OrthancPluginRestOutput* output,
+                                        const char* url,
+                                        const OrthancPluginHttpRequest* request);
 
-REST_RETURN_TYPE SearchForSeries(OrthancPluginRestOutput* output,
-                                 const char* url,
-                                 const OrthancPluginHttpRequest* request);
+OrthancPluginErrorCode SearchForSeries(OrthancPluginRestOutput* output,
+                                       const char* url,
+                                       const OrthancPluginHttpRequest* request);
 
-REST_RETURN_TYPE SearchForInstances(OrthancPluginRestOutput* output,
-                                    const char* url,
-                                    const OrthancPluginHttpRequest* request);
+OrthancPluginErrorCode SearchForInstances(OrthancPluginRestOutput* output,
+                                          const char* url,
+                                          const OrthancPluginHttpRequest* request);
--- a/Plugin/StowRs.cpp	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/StowRs.cpp	Tue Dec 08 17:24:44 2015 +0100
@@ -84,9 +84,9 @@
 
 
 
-REST_RETURN_TYPE StowCallback(OrthancPluginRestOutput* output,
-                              const char* url,
-                              const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode StowCallback(OrthancPluginRestOutput* output,
+                                    const char* url,
+                                    const OrthancPluginHttpRequest* request)
 {
   try
   {
@@ -96,7 +96,7 @@
     if (request->method != OrthancPluginHttpMethod_Post)
     {
       OrthancPluginSendMethodNotAllowed(context_, output, "POST");
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
     std::string expectedStudy;
@@ -122,7 +122,7 @@
     {
       OrthancPluginLogError(context_, "No content type in the HTTP header of a STOW-RS request");
       OrthancPluginSendHttpStatusCode(context_, output, 400 /* Bad request */);
-      return REST_RETURN_SUCCESS;    
+      return OrthancPluginErrorCode_Success;    
     }
 
     std::string application;
@@ -136,7 +136,7 @@
       std::string s = "Unable to parse the content type of a STOW-RS request (" + application + ")";
       OrthancPluginLogError(context_, s.c_str());
       OrthancPluginSendHttpStatusCode(context_, output, 400 /* Bad request */);
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
 
@@ -146,7 +146,7 @@
     {
       OrthancPluginLogError(context_, "The STOW-RS plugin currently only supports application/dicom");
       OrthancPluginSendHttpStatusCode(context_, output, 415 /* Unsupported media type */);
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
 
@@ -164,9 +164,9 @@
           items[i].contentType_ != "application/dicom")
       {
         std::string s = "The STOW-RS request contains a part that is not application/dicom (it is: \"" + items[i].contentType_ + "\")";
-          OrthancPluginLogError(context_, s.c_str());
+        OrthancPluginLogError(context_, s.c_str());
         OrthancPluginSendHttpStatusCode(context_, output, 415 /* Unsupported media type */);
-        return REST_RETURN_SUCCESS;
+        return OrthancPluginErrorCode_Success;
       }
 
       OrthancPlugins::ParsedDicomFile dicom(items[i]);
@@ -229,16 +229,16 @@
 
     OrthancPlugins::AnswerDicom(context_, output, wadoBase, *dictionary_, result, isXml, false);
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
--- a/Plugin/StowRs.h	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/StowRs.h	Tue Dec 08 17:24:44 2015 +0100
@@ -24,6 +24,6 @@
 
 bool IsXmlExpected(const OrthancPluginHttpRequest* request);
 
-REST_RETURN_TYPE StowCallback(OrthancPluginRestOutput* output,
-                              const char* url,
-                              const OrthancPluginHttpRequest* request);
+OrthancPluginErrorCode StowCallback(OrthancPluginRestOutput* output,
+                                    const char* url,
+                                    const OrthancPluginHttpRequest* request);
--- a/Plugin/Wado.cpp	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/Wado.cpp	Tue Dec 08 17:24:44 2015 +0100
@@ -151,8 +151,8 @@
 }
 
 
-static REST_RETURN_TYPE AnswerDicom(OrthancPluginRestOutput* output,
-                                    const std::string& instance)
+static OrthancPluginErrorCode AnswerDicom(OrthancPluginRestOutput* output,
+                                          const std::string& instance)
 {
   std::string uri = "/instances/" + instance + "/file";
 
@@ -160,13 +160,13 @@
   if (OrthancPlugins::RestApiGetString(dicom, context_, uri))
   {
     OrthancPluginAnswerBuffer(context_, output, dicom.c_str(), dicom.size(), "application/dicom");
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   else
   {
     std::string msg = "WADO: Unable to retrieve DICOM file from " + uri;
     OrthancPluginLogError(context_, msg.c_str());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
 
@@ -189,28 +189,28 @@
 }
 
 
-static REST_RETURN_TYPE AnswerPngPreview(OrthancPluginRestOutput* output,
-                                         const std::string& instance)
+static OrthancPluginErrorCode AnswerPngPreview(OrthancPluginRestOutput* output,
+                                               const std::string& instance)
 {
   std::string png;
   if (!RetrievePngPreview(png, instance))
   {
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 
   OrthancPluginAnswerBuffer(context_, output, png.c_str(), png.size(), "image/png");
-  return REST_RETURN_SUCCESS;
+  return OrthancPluginErrorCode_Success;
 }
 
 
-static REST_RETURN_TYPE AnswerJpegPreview(OrthancPluginRestOutput* output,
-                                          const std::string& instance)
+static OrthancPluginErrorCode AnswerJpegPreview(OrthancPluginRestOutput* output,
+                                                const std::string& instance)
 {
   // Retrieve the preview in the PNG format
   std::string png;
   if (!RetrievePngPreview(png, instance))
   {
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 
   // Decode the PNG file
@@ -229,20 +229,20 @@
 
   OrthancPluginFreeImage(context_, image);
 
-  return REST_RETURN_SUCCESS;
+  return OrthancPluginErrorCode_Success;
 }
 
 
-REST_RETURN_TYPE WadoCallback(OrthancPluginRestOutput* output,
-                              const char* url,
-                              const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode WadoCallback(OrthancPluginRestOutput* output,
+                                    const char* url,
+                                    const OrthancPluginHttpRequest* request)
 {
   try
   {
     if (request->method != OrthancPluginHttpMethod_Get)
     {
       OrthancPluginSendMethodNotAllowed(context_, output, "GET");
-      return REST_RETURN_FAILURE;
+      return OrthancPluginErrorCode_Plugin;
     }
 
     std::string instance;
@@ -252,7 +252,7 @@
 #if HAS_ERROR_CODE == 1
       return OrthancPluginErrorCode_UnknownResource;
 #else
-      return REST_RETURN_FAILURE;
+      return OrthancPluginErrorCode_Plugin;
 #endif
     }
 
@@ -273,19 +273,19 @@
     {
       std::string msg = "WADO: Unsupported content type: \"" + contentType + "\"";
       OrthancPluginLogError(context_, msg.c_str());
-      return REST_RETURN_FAILURE;
+      return OrthancPluginErrorCode_Plugin;
     }
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
--- a/Plugin/Wado.h	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/Wado.h	Tue Dec 08 17:24:44 2015 +0100
@@ -22,6 +22,6 @@
 
 #include "Configuration.h"
 
-REST_RETURN_TYPE WadoCallback(OrthancPluginRestOutput* output,
-                              const char* url,
-                              const OrthancPluginHttpRequest* request);
+OrthancPluginErrorCode WadoCallback(OrthancPluginRestOutput* output,
+                                    const char* url,
+                                    const OrthancPluginHttpRequest* request);
--- a/Plugin/WadoRs.cpp	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/WadoRs.cpp	Tue Dec 08 17:24:44 2015 +0100
@@ -172,20 +172,20 @@
 }
 
 
-static REST_RETURN_TYPE AnswerListOfDicomInstances(OrthancPluginRestOutput* output,
-                                                   const std::string& resource)
+static OrthancPluginErrorCode AnswerListOfDicomInstances(OrthancPluginRestOutput* output,
+                                                         const std::string& resource)
 {
   Json::Value instances;
   if (!OrthancPlugins::RestApiGetJson(instances, context_, resource + "/instances"))
   {
     // Internal error
     OrthancPluginSendHttpStatusCode(context_, output, 400);
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
 
   if (OrthancPluginStartMultipartAnswer(context_, output, "related", "application/dicom"))
   {
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   
   for (Json::Value::ArrayIndex i = 0; i < instances.size(); i++)
@@ -195,11 +195,11 @@
     if (OrthancPlugins::RestApiGetString(dicom, context_, uri) &&
         OrthancPluginSendMultipartItem(context_, output, dicom.c_str(), dicom.size()) != 0)
     {
-      return REST_RETURN_FAILURE;
+      return OrthancPluginErrorCode_Plugin;
     }
   }
 
-  return REST_RETURN_SUCCESS;
+  return OrthancPluginErrorCode_Success;
 }
 
 
@@ -378,16 +378,16 @@
 }
 
 
-REST_RETURN_TYPE RetrieveDicomStudy(OrthancPluginRestOutput* output,
-                                    const char* url,
-                                    const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode RetrieveDicomStudy(OrthancPluginRestOutput* output,
+                                          const char* url,
+                                          const OrthancPluginHttpRequest* request)
 {
   try
   {
     if (!AcceptMultipartDicom(request))
     {
       OrthancPluginSendHttpStatusCode(context_, output, 400 /* Bad request */);
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
     std::string uri;
@@ -396,31 +396,31 @@
       AnswerListOfDicomInstances(output, uri);
     }
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
 
 
-REST_RETURN_TYPE RetrieveDicomSeries(OrthancPluginRestOutput* output,
-                                     const char* url,
-                                     const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode RetrieveDicomSeries(OrthancPluginRestOutput* output,
+                                           const char* url,
+                                           const OrthancPluginHttpRequest* request)
 {
   try
   {
     if (!AcceptMultipartDicom(request))
     {
       OrthancPluginSendHttpStatusCode(context_, output, 400 /* Bad request */);
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
     std::string uri;
@@ -429,32 +429,32 @@
       AnswerListOfDicomInstances(output, uri);
     }
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
 
 
 
-REST_RETURN_TYPE RetrieveDicomInstance(OrthancPluginRestOutput* output,
-                                       const char* url,
-                                       const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode RetrieveDicomInstance(OrthancPluginRestOutput* output,
+                                             const char* url,
+                                             const OrthancPluginHttpRequest* request)
 {
   try
   {
     if (!AcceptMultipartDicom(request))
     {
       OrthancPluginSendHttpStatusCode(context_, output, 400 /* Bad request */);
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
     std::string uri;
@@ -462,36 +462,36 @@
     {
       if (OrthancPluginStartMultipartAnswer(context_, output, "related", "application/dicom"))
       {
-        return REST_RETURN_FAILURE;
+        return OrthancPluginErrorCode_Plugin;
       }
   
       std::string dicom;
       if (OrthancPlugins::RestApiGetString(dicom, context_, uri + "/file") &&
           OrthancPluginSendMultipartItem(context_, output, dicom.c_str(), dicom.size()) != 0)
       {
-        return REST_RETURN_FAILURE;
+        return OrthancPluginErrorCode_Plugin;
       }
     }
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
 
 
 
-REST_RETURN_TYPE RetrieveStudyMetadata(OrthancPluginRestOutput* output,
-                                       const char* url,
-                                       const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode RetrieveStudyMetadata(OrthancPluginRestOutput* output,
+                                             const char* url,
+                                             const OrthancPluginHttpRequest* request)
 {
   try
   {
@@ -499,7 +499,7 @@
     if (!AcceptMetadata(request, isXml))
     {
       OrthancPluginSendHttpStatusCode(context_, output, 400 /* Bad request */);
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
     std::string uri;
@@ -508,24 +508,24 @@
       AnswerMetadata(output, request, uri, false, isXml);
     }
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
 
 
-REST_RETURN_TYPE RetrieveSeriesMetadata(OrthancPluginRestOutput* output,
-                                        const char* url,
-                                        const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode RetrieveSeriesMetadata(OrthancPluginRestOutput* output,
+                                              const char* url,
+                                              const OrthancPluginHttpRequest* request)
 {
   try
   {
@@ -533,7 +533,7 @@
     if (!AcceptMetadata(request, isXml))
     {
       OrthancPluginSendHttpStatusCode(context_, output, 400 /* Bad request */);
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
     std::string uri;
@@ -542,24 +542,24 @@
       AnswerMetadata(output, request, uri, false, isXml);
     }
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
 
 
-REST_RETURN_TYPE RetrieveInstanceMetadata(OrthancPluginRestOutput* output,
-                                          const char* url,
-                                          const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode RetrieveInstanceMetadata(OrthancPluginRestOutput* output,
+                                                const char* url,
+                                                const OrthancPluginHttpRequest* request)
 {
   try
   {
@@ -567,7 +567,7 @@
     if (!AcceptMetadata(request, isXml))
     {
       OrthancPluginSendHttpStatusCode(context_, output, 400 /* Bad request */);
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
     std::string uri;
@@ -576,17 +576,17 @@
       AnswerMetadata(output, request, uri, true, isXml);
     }
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
 
@@ -662,16 +662,16 @@
   return false;
 }
 
-REST_RETURN_TYPE RetrieveBulkData(OrthancPluginRestOutput* output,
-                                  const char* url,
-                                  const OrthancPluginHttpRequest* request)
+OrthancPluginErrorCode RetrieveBulkData(OrthancPluginRestOutput* output,
+                                        const char* url,
+                                        const OrthancPluginHttpRequest* request)
 {
   try
   {
     if (!AcceptBulkData(request))
     {
       OrthancPluginSendHttpStatusCode(context_, output, 400 /* Bad request */);
-      return REST_RETURN_SUCCESS;
+      return OrthancPluginErrorCode_Success;
     }
 
     std::string uri, content;
@@ -690,7 +690,7 @@
         if (OrthancPluginStartMultipartAnswer(context_, output, "related", "application/octet-stream") != 0 ||
             OrthancPluginSendMultipartItem(context_, output, result.c_str(), result.size()) != 0)
         {
-          return REST_RETURN_FAILURE;
+          return OrthancPluginErrorCode_Plugin;
         }
       }
       else
@@ -699,16 +699,16 @@
       }      
     }
 
-    return REST_RETURN_SUCCESS;
+    return OrthancPluginErrorCode_Success;
   }
   catch (Orthanc::OrthancException& e)
   {
     OrthancPluginLogError(context_, e.What());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
   catch (std::runtime_error& e)
   {
     OrthancPluginLogError(context_, e.what());
-    return REST_RETURN_FAILURE;
+    return OrthancPluginErrorCode_Plugin;
   }
 }
--- a/Plugin/WadoRs.h	Tue Dec 08 17:17:22 2015 +0100
+++ b/Plugin/WadoRs.h	Tue Dec 08 17:24:44 2015 +0100
@@ -23,30 +23,30 @@
 #include "Configuration.h"
 
 
-REST_RETURN_TYPE RetrieveDicomStudy(OrthancPluginRestOutput* output,
-                                    const char* url,
-                                    const OrthancPluginHttpRequest* request);
-
-REST_RETURN_TYPE RetrieveDicomSeries(OrthancPluginRestOutput* output,
-                                     const char* url,
-                                     const OrthancPluginHttpRequest* request);
-
-REST_RETURN_TYPE RetrieveDicomInstance(OrthancPluginRestOutput* output,
-                                       const char* url,
-                                       const OrthancPluginHttpRequest* request);
-
-REST_RETURN_TYPE RetrieveStudyMetadata(OrthancPluginRestOutput* output,
-                                       const char* url,
-                                       const OrthancPluginHttpRequest* request);
-
-REST_RETURN_TYPE RetrieveSeriesMetadata(OrthancPluginRestOutput* output,
-                                        const char* url,
-                                        const OrthancPluginHttpRequest* request);
-
-REST_RETURN_TYPE RetrieveInstanceMetadata(OrthancPluginRestOutput* output,
+OrthancPluginErrorCode RetrieveDicomStudy(OrthancPluginRestOutput* output,
                                           const char* url,
                                           const OrthancPluginHttpRequest* request);
 
-REST_RETURN_TYPE RetrieveBulkData(OrthancPluginRestOutput* output,
-                                  const char* url,
-                                  const OrthancPluginHttpRequest* request);
+OrthancPluginErrorCode RetrieveDicomSeries(OrthancPluginRestOutput* output,
+                                           const char* url,
+                                           const OrthancPluginHttpRequest* request);
+
+OrthancPluginErrorCode RetrieveDicomInstance(OrthancPluginRestOutput* output,
+                                             const char* url,
+                                             const OrthancPluginHttpRequest* request);
+
+OrthancPluginErrorCode RetrieveStudyMetadata(OrthancPluginRestOutput* output,
+                                             const char* url,
+                                             const OrthancPluginHttpRequest* request);
+
+OrthancPluginErrorCode RetrieveSeriesMetadata(OrthancPluginRestOutput* output,
+                                              const char* url,
+                                              const OrthancPluginHttpRequest* request);
+
+OrthancPluginErrorCode RetrieveInstanceMetadata(OrthancPluginRestOutput* output,
+                                                const char* url,
+                                                const OrthancPluginHttpRequest* request);
+
+OrthancPluginErrorCode RetrieveBulkData(OrthancPluginRestOutput* output,
+                                        const char* url,
+                                        const OrthancPluginHttpRequest* request);