changeset 3028:ff65c925f57a

fix indentation
author am@osimis.io
date Tue, 18 Dec 2018 14:37:53 +0100
parents c358bdb37c13
children 19ebb606910d 3254b36a5f9b
files Plugins/Samples/Common/OrthancPluginCppWrapper.cpp
diffstat 1 files changed, 1744 insertions(+), 1744 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp	Tue Dec 18 12:07:52 2018 +0100
+++ b/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp	Tue Dec 18 14:37:53 2018 +0100
@@ -39,1993 +39,1993 @@
 
 namespace OrthancPlugins
 {
-static OrthancPluginContext* globalContext_ = NULL;
+  static OrthancPluginContext* globalContext_ = NULL;
 
 
-void SetGlobalContext(OrthancPluginContext* context)
-{
-  if (context == NULL)
-  {
-    ORTHANC_PLUGINS_THROW_EXCEPTION(NullPointer);
-  }
-  else if (globalContext_ == NULL)
+  void SetGlobalContext(OrthancPluginContext* context)
   {
-    globalContext_ = context;
+    if (context == NULL)
+    {
+      ORTHANC_PLUGINS_THROW_EXCEPTION(NullPointer);
+    }
+    else if (globalContext_ == NULL)
+    {
+      globalContext_ = context;
+    }
+    else
+    {
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls);
+    }
   }
-  else
-  {
-    ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls);
-  }
-}
 
 
-bool HasGlobalContext()
-{
-  return globalContext_ != NULL;
-}
+  bool HasGlobalContext()
+  {
+    return globalContext_ != NULL;
+  }
+
+
+  OrthancPluginContext* GetGlobalContext()
+  {
+    if (globalContext_ == NULL)
+    {
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls);
+    }
+    else
+    {
+      return globalContext_;
+    }
+  }
 
 
-OrthancPluginContext* GetGlobalContext()
-{
-  if (globalContext_ == NULL)
+  void MemoryBuffer::Check(OrthancPluginErrorCode code)
   {
-    ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls);
+    if (code != OrthancPluginErrorCode_Success)
+    {
+      // Prevent using garbage information
+      buffer_.data = NULL;
+      buffer_.size = 0;
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code);
+    }
   }
-  else
-  {
-    return globalContext_;
-  }
-}
 
 
-void MemoryBuffer::Check(OrthancPluginErrorCode code)
-{
-  if (code != OrthancPluginErrorCode_Success)
+  bool MemoryBuffer::CheckHttp(OrthancPluginErrorCode code)
   {
-    // Prevent using garbage information
-    buffer_.data = NULL;
-    buffer_.size = 0;
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code);
+    if (code != OrthancPluginErrorCode_Success)
+    {
+      // Prevent using garbage information
+      buffer_.data = NULL;
+      buffer_.size = 0;
+    }
+
+    if (code == OrthancPluginErrorCode_Success)
+    {
+      return true;
+    }
+    else if (code == OrthancPluginErrorCode_UnknownResource ||
+             code == OrthancPluginErrorCode_InexistentItem)
+    {
+      return false;
+    }
+    else
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code);
+    }
   }
-}
 
 
-bool MemoryBuffer::CheckHttp(OrthancPluginErrorCode code)
-{
-  if (code != OrthancPluginErrorCode_Success)
+  MemoryBuffer::MemoryBuffer()
   {
-    // Prevent using garbage information
     buffer_.data = NULL;
     buffer_.size = 0;
   }
 
-  if (code == OrthancPluginErrorCode_Success)
-  {
-    return true;
-  }
-  else if (code == OrthancPluginErrorCode_UnknownResource ||
-           code == OrthancPluginErrorCode_InexistentItem)
+
+  void MemoryBuffer::Clear()
   {
-    return false;
+    if (buffer_.data != NULL)
+    {
+      OrthancPluginFreeMemoryBuffer(GetGlobalContext(), &buffer_);
+      buffer_.data = NULL;
+      buffer_.size = 0;
+    }
   }
-  else
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code);
-  }
-}
 
 
-MemoryBuffer::MemoryBuffer()
-{
-  buffer_.data = NULL;
-  buffer_.size = 0;
-}
+  void MemoryBuffer::Assign(OrthancPluginMemoryBuffer& other)
+  {
+    Clear();
+
+    buffer_.data = other.data;
+    buffer_.size = other.size;
+
+    other.data = NULL;
+    other.size = 0;
+  }
 
 
-void MemoryBuffer::Clear()
-{
-  if (buffer_.data != NULL)
+  OrthancPluginMemoryBuffer MemoryBuffer::Release()
   {
-    OrthancPluginFreeMemoryBuffer(GetGlobalContext(), &buffer_);
+    OrthancPluginMemoryBuffer result = buffer_;
+
     buffer_.data = NULL;
     buffer_.size = 0;
+
+    return result;
   }
-}
+
+
+  void MemoryBuffer::ToString(std::string& target) const
+  {
+    if (buffer_.size == 0)
+    {
+      target.clear();
+    }
+    else
+    {
+      target.assign(reinterpret_cast<const char*>(buffer_.data), buffer_.size);
+    }
+  }
 
 
-void MemoryBuffer::Assign(OrthancPluginMemoryBuffer& other)
-{
-  Clear();
-
-  buffer_.data = other.data;
-  buffer_.size = other.size;
-
-  other.data = NULL;
-  other.size = 0;
-}
+  void MemoryBuffer::ToJson(Json::Value& target) const
+  {
+    if (buffer_.data == NULL ||
+        buffer_.size == 0)
+    {
+      ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    }
 
-
-OrthancPluginMemoryBuffer MemoryBuffer::Release()
-{
-  OrthancPluginMemoryBuffer result = buffer_;
+    const char* tmp = reinterpret_cast<const char*>(buffer_.data);
 
-  buffer_.data = NULL;
-  buffer_.size = 0;
-
-  return result;
-}
+    Json::Reader reader;
+    if (!reader.parse(tmp, tmp + buffer_.size, target))
+    {
+      LogError("Cannot convert some memory buffer to JSON");
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    }
+  }
 
 
-void MemoryBuffer::ToString(std::string& target) const
-{
-  if (buffer_.size == 0)
-  {
-    target.clear();
-  }
-  else
+  bool MemoryBuffer::RestApiGet(const std::string& uri,
+                                bool applyPlugins)
   {
-    target.assign(reinterpret_cast<const char*>(buffer_.data), buffer_.size);
-  }
-}
-
+    Clear();
 
-void MemoryBuffer::ToJson(Json::Value& target) const
-{
-  if (buffer_.data == NULL ||
-      buffer_.size == 0)
-  {
-    ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    if (applyPlugins)
+    {
+      return CheckHttp(OrthancPluginRestApiGetAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str()));
+    }
+    else
+    {
+      return CheckHttp(OrthancPluginRestApiGet(GetGlobalContext(), &buffer_, uri.c_str()));
+    }
   }
 
-  const char* tmp = reinterpret_cast<const char*>(buffer_.data);
-
-  Json::Reader reader;
-  if (!reader.parse(tmp, tmp + buffer_.size, target))
+  bool MemoryBuffer::RestApiGet(const std::string& uri,
+                                const std::map<std::string, std::string>& httpHeaders,
+                                bool applyPlugins)
   {
-    LogError("Cannot convert some memory buffer to JSON");
-    ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    Clear();
+
+    std::vector<const char*> headersKeys;
+    std::vector<const char*> headersValues;
+    for (std::map<std::string, std::string>::const_iterator it = httpHeaders.begin(); it != httpHeaders.end(); it++)
+    {
+      headersKeys.push_back(it->first.c_str());
+      headersValues.push_back(it->second.c_str());
+    }
+
+    return CheckHttp(OrthancPluginRestApiGet2(GetGlobalContext(), &buffer_, uri.c_str(), httpHeaders.size(), headersKeys.data(), headersValues.data(), applyPlugins));
   }
-}
+
+  bool MemoryBuffer::RestApiPost(const std::string& uri,
+                                 const char* body,
+                                 size_t bodySize,
+                                 bool applyPlugins)
+  {
+    Clear();
+
+    if (applyPlugins)
+    {
+      return CheckHttp(OrthancPluginRestApiPostAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize));
+    }
+    else
+    {
+      return CheckHttp(OrthancPluginRestApiPost(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize));
+    }
+  }
 
 
-bool MemoryBuffer::RestApiGet(const std::string& uri,
-                              bool applyPlugins)
-{
-  Clear();
+  bool MemoryBuffer::RestApiPut(const std::string& uri,
+                                const char* body,
+                                size_t bodySize,
+                                bool applyPlugins)
+  {
+    Clear();
 
-  if (applyPlugins)
-  {
-    return CheckHttp(OrthancPluginRestApiGetAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str()));
-  }
-  else
-  {
-    return CheckHttp(OrthancPluginRestApiGet(GetGlobalContext(), &buffer_, uri.c_str()));
+    if (applyPlugins)
+    {
+      return CheckHttp(OrthancPluginRestApiPutAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize));
+    }
+    else
+    {
+      return CheckHttp(OrthancPluginRestApiPut(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize));
+    }
   }
-}
+
 
-bool MemoryBuffer::RestApiGet(const std::string& uri,
-                              const std::map<std::string, std::string>& httpHeaders,
-                              bool applyPlugins)
-{
-  Clear();
-
-  std::vector<const char*> headersKeys;
-  std::vector<const char*> headersValues;
-  for (std::map<std::string, std::string>::const_iterator it = httpHeaders.begin(); it != httpHeaders.end(); it++)
+  bool MemoryBuffer::RestApiPost(const std::string& uri,
+                                 const Json::Value& body,
+                                 bool applyPlugins)
   {
-    headersKeys.push_back(it->first.c_str());
-    headersValues.push_back(it->second.c_str());
+    Json::FastWriter writer;
+    return RestApiPost(uri, writer.write(body), applyPlugins);
   }
 
-  return CheckHttp(OrthancPluginRestApiGet2(GetGlobalContext(), &buffer_, uri.c_str(), httpHeaders.size(), headersKeys.data(), headersValues.data(), applyPlugins));
-}
+
+  bool MemoryBuffer::RestApiPut(const std::string& uri,
+                                const Json::Value& body,
+                                bool applyPlugins)
+  {
+    Json::FastWriter writer;
+    return RestApiPut(uri, writer.write(body), applyPlugins);
+  }
 
-bool MemoryBuffer::RestApiPost(const std::string& uri,
-                               const char* body,
-                               size_t bodySize,
-                               bool applyPlugins)
-{
-  Clear();
+
+  void MemoryBuffer::CreateDicom(const Json::Value& tags,
+                                 OrthancPluginCreateDicomFlags flags)
+  {
+    Clear();
+
+    Json::FastWriter writer;
+    std::string s = writer.write(tags);
 
-  if (applyPlugins)
-  {
-    return CheckHttp(OrthancPluginRestApiPostAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize));
+    Check(OrthancPluginCreateDicom(GetGlobalContext(), &buffer_, s.c_str(), NULL, flags));
   }
-  else
+
+  void MemoryBuffer::CreateDicom(const Json::Value& tags,
+                                 const OrthancImage& pixelData,
+                                 OrthancPluginCreateDicomFlags flags)
   {
-    return CheckHttp(OrthancPluginRestApiPost(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize));
+    Clear();
+
+    Json::FastWriter writer;
+    std::string s = writer.write(tags);
+
+    Check(OrthancPluginCreateDicom(GetGlobalContext(), &buffer_, s.c_str(), pixelData.GetObject(), flags));
   }
-}
+
+
+  void MemoryBuffer::ReadFile(const std::string& path)
+  {
+    Clear();
+    Check(OrthancPluginReadFile(GetGlobalContext(), &buffer_, path.c_str()));
+  }
 
 
-bool MemoryBuffer::RestApiPut(const std::string& uri,
-                              const char* body,
-                              size_t bodySize,
-                              bool applyPlugins)
-{
-  Clear();
-
-  if (applyPlugins)
+  void MemoryBuffer::GetDicomQuery(const OrthancPluginWorklistQuery* query)
   {
-    return CheckHttp(OrthancPluginRestApiPutAfterPlugins(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize));
+    Clear();
+    Check(OrthancPluginWorklistGetDicomQuery(GetGlobalContext(), &buffer_, query));
   }
-  else
-  {
-    return CheckHttp(OrthancPluginRestApiPut(GetGlobalContext(), &buffer_, uri.c_str(), body, bodySize));
-  }
-}
 
 
-bool MemoryBuffer::RestApiPost(const std::string& uri,
-                               const Json::Value& body,
-                               bool applyPlugins)
-{
-  Json::FastWriter writer;
-  return RestApiPost(uri, writer.write(body), applyPlugins);
-}
+  void OrthancString::Assign(char* str)
+  {
+    if (str == NULL)
+    {
+      ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    }
+    else
+    {
+      Clear();
+      str_ = str;
+    }
+  }
 
 
-bool MemoryBuffer::RestApiPut(const std::string& uri,
-                              const Json::Value& body,
-                              bool applyPlugins)
-{
-  Json::FastWriter writer;
-  return RestApiPut(uri, writer.write(body), applyPlugins);
-}
+  void OrthancString::Clear()
+  {
+    if (str_ != NULL)
+    {
+      OrthancPluginFreeString(GetGlobalContext(), str_);
+      str_ = NULL;
+    }
+  }
 
 
-void MemoryBuffer::CreateDicom(const Json::Value& tags,
-                               OrthancPluginCreateDicomFlags flags)
-{
-  Clear();
-
-  Json::FastWriter writer;
-  std::string s = writer.write(tags);
-
-  Check(OrthancPluginCreateDicom(GetGlobalContext(), &buffer_, s.c_str(), NULL, flags));
-}
-
-void MemoryBuffer::CreateDicom(const Json::Value& tags,
-                               const OrthancImage& pixelData,
-                               OrthancPluginCreateDicomFlags flags)
-{
-  Clear();
-
-  Json::FastWriter writer;
-  std::string s = writer.write(tags);
-
-  Check(OrthancPluginCreateDicom(GetGlobalContext(), &buffer_, s.c_str(), pixelData.GetObject(), flags));
-}
+  void OrthancString::ToString(std::string& target) const
+  {
+    if (str_ == NULL)
+    {
+      target.clear();
+    }
+    else
+    {
+      target.assign(str_);
+    }
+  }
 
 
-void MemoryBuffer::ReadFile(const std::string& path)
-{
-  Clear();
-  Check(OrthancPluginReadFile(GetGlobalContext(), &buffer_, path.c_str()));
-}
+  void OrthancString::ToJson(Json::Value& target) const
+  {
+    if (str_ == NULL)
+    {
+      LogError("Cannot convert an empty memory buffer to JSON");
+      ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    }
+
+    Json::Reader reader;
+    if (!reader.parse(str_, target))
+    {
+      LogError("Cannot convert some memory buffer to JSON");
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    }
+  }
 
 
-void MemoryBuffer::GetDicomQuery(const OrthancPluginWorklistQuery* query)
-{
-  Clear();
-  Check(OrthancPluginWorklistGetDicomQuery(GetGlobalContext(), &buffer_, query));
-}
+  void MemoryBuffer::DicomToJson(Json::Value& target,
+                                 OrthancPluginDicomToJsonFormat format,
+                                 OrthancPluginDicomToJsonFlags flags,
+                                 uint32_t maxStringLength)
+  {
+    OrthancString str;
+    str.Assign(OrthancPluginDicomBufferToJson
+               (GetGlobalContext(), GetData(), GetSize(), format, flags, maxStringLength));
+    str.ToJson(target);
+  }
 
 
-void OrthancString::Assign(char* str)
-{
-  if (str == NULL)
-  {
-    ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
-  }
-  else
+  bool MemoryBuffer::HttpGet(const std::string& url,
+                             const std::string& username,
+                             const std::string& password)
   {
     Clear();
-    str_ = str;
+    return CheckHttp(OrthancPluginHttpGet(GetGlobalContext(), &buffer_, url.c_str(),
+                                          username.empty() ? NULL : username.c_str(),
+                                          password.empty() ? NULL : password.c_str()));
   }
-}
-
-
-void OrthancString::Clear()
-{
-  if (str_ != NULL)
-  {
-    OrthancPluginFreeString(GetGlobalContext(), str_);
-    str_ = NULL;
-  }
-}
 
 
-void OrthancString::ToString(std::string& target) const
-{
-  if (str_ == NULL)
+  bool MemoryBuffer::HttpPost(const std::string& url,
+                              const std::string& body,
+                              const std::string& username,
+                              const std::string& password)
   {
-    target.clear();
+    Clear();
+    return CheckHttp(OrthancPluginHttpPost(GetGlobalContext(), &buffer_, url.c_str(),
+                                           body.c_str(), body.size(),
+                                           username.empty() ? NULL : username.c_str(),
+                                           password.empty() ? NULL : password.c_str()));
   }
-  else
-  {
-    target.assign(str_);
-  }
-}
 
 
-void OrthancString::ToJson(Json::Value& target) const
-{
-  if (str_ == NULL)
+  bool MemoryBuffer::HttpPut(const std::string& url,
+                             const std::string& body,
+                             const std::string& username,
+                             const std::string& password)
   {
-    LogError("Cannot convert an empty memory buffer to JSON");
-    ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    Clear();
+    return CheckHttp(OrthancPluginHttpPut(GetGlobalContext(), &buffer_, url.c_str(),
+                                          body.empty() ? NULL : body.c_str(),
+                                          body.size(),
+                                          username.empty() ? NULL : username.c_str(),
+                                          password.empty() ? NULL : password.c_str()));
   }
 
-  Json::Reader reader;
-  if (!reader.parse(str_, target))
+
+  void MemoryBuffer::GetDicomInstance(const std::string& instanceId)
   {
-    LogError("Cannot convert some memory buffer to JSON");
-    ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    Clear();
+    Check(OrthancPluginGetDicomForInstance(GetGlobalContext(), &buffer_, instanceId.c_str()));
   }
-}
 
 
-void MemoryBuffer::DicomToJson(Json::Value& target,
-                               OrthancPluginDicomToJsonFormat format,
-                               OrthancPluginDicomToJsonFlags flags,
-                               uint32_t maxStringLength)
-{
-  OrthancString str;
-  str.Assign(OrthancPluginDicomBufferToJson
-             (GetGlobalContext(), GetData(), GetSize(), format, flags, maxStringLength));
-  str.ToJson(target);
-}
+  bool HttpDelete(const std::string& url,
+                  const std::string& username,
+                  const std::string& password)
+  {
+    OrthancPluginErrorCode error = OrthancPluginHttpDelete
+        (GetGlobalContext(), url.c_str(),
+         username.empty() ? NULL : username.c_str(),
+         password.empty() ? NULL : password.c_str());
+
+    if (error == OrthancPluginErrorCode_Success)
+    {
+      return true;
+    }
+    else if (error == OrthancPluginErrorCode_UnknownResource ||
+             error == OrthancPluginErrorCode_InexistentItem)
+    {
+      return false;
+    }
+    else
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error);
+    }
+  }
 
 
-bool MemoryBuffer::HttpGet(const std::string& url,
-                           const std::string& username,
-                           const std::string& password)
-{
-  Clear();
-  return CheckHttp(OrthancPluginHttpGet(GetGlobalContext(), &buffer_, url.c_str(),
-                                        username.empty() ? NULL : username.c_str(),
-                                        password.empty() ? NULL : password.c_str()));
-}
+  void LogError(const std::string& message)
+  {
+    if (HasGlobalContext())
+    {
+      OrthancPluginLogError(GetGlobalContext(), message.c_str());
+    }
+  }
 
 
-bool MemoryBuffer::HttpPost(const std::string& url,
-                            const std::string& body,
-                            const std::string& username,
-                            const std::string& password)
-{
-  Clear();
-  return CheckHttp(OrthancPluginHttpPost(GetGlobalContext(), &buffer_, url.c_str(),
-                                         body.c_str(), body.size(),
-                                         username.empty() ? NULL : username.c_str(),
-                                         password.empty() ? NULL : password.c_str()));
-}
+  void LogWarning(const std::string& message)
+  {
+    if (HasGlobalContext())
+    {
+      OrthancPluginLogWarning(GetGlobalContext(), message.c_str());
+    }
+  }
+
+
+  void LogInfo(const std::string& message)
+  {
+    if (HasGlobalContext())
+    {
+      OrthancPluginLogInfo(GetGlobalContext(), message.c_str());
+    }
+  }
 
 
-bool MemoryBuffer::HttpPut(const std::string& url,
-                           const std::string& body,
-                           const std::string& username,
-                           const std::string& password)
-{
-  Clear();
-  return CheckHttp(OrthancPluginHttpPut(GetGlobalContext(), &buffer_, url.c_str(),
-                                        body.empty() ? NULL : body.c_str(),
-                                        body.size(),
-                                        username.empty() ? NULL : username.c_str(),
-                                        password.empty() ? NULL : password.c_str()));
-}
+  OrthancConfiguration::OrthancConfiguration()
+  {
+    OrthancString str;
+    str.Assign(OrthancPluginGetConfiguration(GetGlobalContext()));
 
+    if (str.GetContent() == NULL)
+    {
+      LogError("Cannot access the Orthanc configuration");
+      ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    }
 
-void MemoryBuffer::GetDicomInstance(const std::string& instanceId)
-{
-  Clear();
-  Check(OrthancPluginGetDicomForInstance(GetGlobalContext(), &buffer_, instanceId.c_str()));
-}
+    str.ToJson(configuration_);
+
+    if (configuration_.type() != Json::objectValue)
+    {
+      LogError("Unable to read the Orthanc configuration");
+      ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    }
+  }
 
 
-bool HttpDelete(const std::string& url,
-                const std::string& username,
-                const std::string& password)
-{
-  OrthancPluginErrorCode error = OrthancPluginHttpDelete
-      (GetGlobalContext(), url.c_str(),
-       username.empty() ? NULL : username.c_str(),
-       password.empty() ? NULL : password.c_str());
-
-  if (error == OrthancPluginErrorCode_Success)
+  std::string OrthancConfiguration::GetPath(const std::string& key) const
   {
-    return true;
+    if (path_.empty())
+    {
+      return key;
+    }
+    else
+    {
+      return path_ + "." + key;
+    }
   }
-  else if (error == OrthancPluginErrorCode_UnknownResource ||
-           error == OrthancPluginErrorCode_InexistentItem)
+
+
+  bool OrthancConfiguration::IsSection(const std::string& key) const
   {
-    return false;
+    assert(configuration_.type() == Json::objectValue);
+
+    return (configuration_.isMember(key) &&
+            configuration_[key].type() == Json::objectValue);
   }
-  else
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error);
-  }
-}
 
 
-void LogError(const std::string& message)
-{
-  if (HasGlobalContext())
-  {
-    OrthancPluginLogError(GetGlobalContext(), message.c_str());
-  }
-}
-
-
-void LogWarning(const std::string& message)
-{
-  if (HasGlobalContext())
+  void OrthancConfiguration::GetSection(OrthancConfiguration& target,
+                                        const std::string& key) const
   {
-    OrthancPluginLogWarning(GetGlobalContext(), message.c_str());
-  }
-}
+    assert(configuration_.type() == Json::objectValue);
 
+    target.path_ = GetPath(key);
 
-void LogInfo(const std::string& message)
-{
-  if (HasGlobalContext())
-  {
-    OrthancPluginLogInfo(GetGlobalContext(), message.c_str());
+    if (!configuration_.isMember(key))
+    {
+      target.configuration_ = Json::objectValue;
+    }
+    else
+    {
+      if (configuration_[key].type() != Json::objectValue)
+      {
+        LogError("The configuration section \"" + target.path_ +
+                 "\" is not an associative array as expected");
+
+        ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+      }
+
+      target.configuration_ = configuration_[key];
+    }
   }
-}
 
 
-OrthancConfiguration::OrthancConfiguration()
-{
-  OrthancString str;
-  str.Assign(OrthancPluginGetConfiguration(GetGlobalContext()));
+  bool OrthancConfiguration::LookupStringValue(std::string& target,
+                                               const std::string& key) const
+  {
+    assert(configuration_.type() == Json::objectValue);
+
+    if (!configuration_.isMember(key))
+    {
+      return false;
+    }
 
-  if (str.GetContent() == NULL)
-  {
-    LogError("Cannot access the Orthanc configuration");
-    ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    if (configuration_[key].type() != Json::stringValue)
+    {
+      LogError("The configuration option \"" + GetPath(key) +
+               "\" is not a string as expected");
+
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    }
+
+    target = configuration_[key].asString();
+    return true;
   }
 
-  str.ToJson(configuration_);
-
-  if (configuration_.type() != Json::objectValue)
-  {
-    LogError("Unable to read the Orthanc configuration");
-    ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
-  }
-}
-
 
-std::string OrthancConfiguration::GetPath(const std::string& key) const
-{
-  if (path_.empty())
+  bool OrthancConfiguration::LookupIntegerValue(int& target,
+                                                const std::string& key) const
   {
-    return key;
+    assert(configuration_.type() == Json::objectValue);
+
+    if (!configuration_.isMember(key))
+    {
+      return false;
+    }
+
+    switch (configuration_[key].type())
+    {
+    case Json::intValue:
+      target = configuration_[key].asInt();
+      return true;
+
+    case Json::uintValue:
+      target = configuration_[key].asUInt();
+      return true;
+
+    default:
+      LogError("The configuration option \"" + GetPath(key) +
+               "\" is not an integer as expected");
+
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    }
   }
-  else
-  {
-    return path_ + "." + key;
-  }
-}
 
 
-bool OrthancConfiguration::IsSection(const std::string& key) const
-{
-  assert(configuration_.type() == Json::objectValue);
+  bool OrthancConfiguration::LookupUnsignedIntegerValue(unsigned int& target,
+                                                        const std::string& key) const
+  {
+    int tmp;
+    if (!LookupIntegerValue(tmp, key))
+    {
+      return false;
+    }
 
-  return (configuration_.isMember(key) &&
-          configuration_[key].type() == Json::objectValue);
-}
+    if (tmp < 0)
+    {
+      LogError("The configuration option \"" + GetPath(key) +
+               "\" is not a positive integer as expected");
+
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    }
+    else
+    {
+      target = static_cast<unsigned int>(tmp);
+      return true;
+    }
+  }
 
 
-void OrthancConfiguration::GetSection(OrthancConfiguration& target,
-                                      const std::string& key) const
-{
-  assert(configuration_.type() == Json::objectValue);
-
-  target.path_ = GetPath(key);
-
-  if (!configuration_.isMember(key))
+  bool OrthancConfiguration::LookupBooleanValue(bool& target,
+                                                const std::string& key) const
   {
-    target.configuration_ = Json::objectValue;
-  }
-  else
-  {
-    if (configuration_[key].type() != Json::objectValue)
+    assert(configuration_.type() == Json::objectValue);
+
+    if (!configuration_.isMember(key))
     {
-      LogError("The configuration section \"" + target.path_ +
-               "\" is not an associative array as expected");
+      return false;
+    }
+
+    if (configuration_[key].type() != Json::booleanValue)
+    {
+      LogError("The configuration option \"" + GetPath(key) +
+               "\" is not a Boolean as expected");
 
       ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
     }
 
-    target.configuration_ = configuration_[key];
+    target = configuration_[key].asBool();
+    return true;
   }
-}
+
+
+  bool OrthancConfiguration::LookupFloatValue(float& target,
+                                              const std::string& key) const
+  {
+    assert(configuration_.type() == Json::objectValue);
+
+    if (!configuration_.isMember(key))
+    {
+      return false;
+    }
+
+    switch (configuration_[key].type())
+    {
+    case Json::realValue:
+      target = configuration_[key].asFloat();
+      return true;
+
+    case Json::intValue:
+      target = static_cast<float>(configuration_[key].asInt());
+      return true;
+
+    case Json::uintValue:
+      target = static_cast<float>(configuration_[key].asUInt());
+      return true;
+
+    default:
+      LogError("The configuration option \"" + GetPath(key) +
+               "\" is not an integer as expected");
+
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    }
+  }
 
 
-bool OrthancConfiguration::LookupStringValue(std::string& target,
-                                             const std::string& key) const
-{
-  assert(configuration_.type() == Json::objectValue);
-
-  if (!configuration_.isMember(key))
+  bool OrthancConfiguration::LookupListOfStrings(std::list<std::string>& target,
+                                                 const std::string& key,
+                                                 bool allowSingleString) const
   {
-    return false;
-  }
+    assert(configuration_.type() == Json::objectValue);
+
+    target.clear();
+
+    if (!configuration_.isMember(key))
+    {
+      return false;
+    }
+
+    switch (configuration_[key].type())
+    {
+    case Json::arrayValue:
+    {
+      bool ok = true;
 
-  if (configuration_[key].type() != Json::stringValue)
-  {
+      for (Json::Value::ArrayIndex i = 0; ok && i < configuration_[key].size(); i++)
+      {
+        if (configuration_[key][i].type() == Json::stringValue)
+        {
+          target.push_back(configuration_[key][i].asString());
+        }
+        else
+        {
+          ok = false;
+        }
+      }
+
+      if (ok)
+      {
+        return true;
+      }
+
+      break;
+    }
+
+    case Json::stringValue:
+      if (allowSingleString)
+      {
+        target.push_back(configuration_[key].asString());
+        return true;
+      }
+
+      break;
+
+    default:
+      break;
+    }
+
     LogError("The configuration option \"" + GetPath(key) +
-             "\" is not a string as expected");
+             "\" is not a list of strings as expected");
 
     ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
   }
 
-  target = configuration_[key].asString();
-  return true;
-}
 
+  bool OrthancConfiguration::LookupSetOfStrings(std::set<std::string>& target,
+                                                const std::string& key,
+                                                bool allowSingleString) const
+  {
+    std::list<std::string> lst;
+
+    if (LookupListOfStrings(lst, key, allowSingleString))
+    {
+      target.clear();
 
-bool OrthancConfiguration::LookupIntegerValue(int& target,
-                                              const std::string& key) const
-{
-  assert(configuration_.type() == Json::objectValue);
+      for (std::list<std::string>::const_iterator
+           it = lst.begin(); it != lst.end(); ++it)
+      {
+        target.insert(*it);
+      }
 
-  if (!configuration_.isMember(key))
-  {
-    return false;
+      return true;
+    }
+    else
+    {
+      return false;
+    }
   }
 
-  switch (configuration_[key].type())
+
+  std::string OrthancConfiguration::GetStringValue(const std::string& key,
+                                                   const std::string& defaultValue) const
   {
-  case Json::intValue:
-    target = configuration_[key].asInt();
-    return true;
-
-  case Json::uintValue:
-    target = configuration_[key].asUInt();
-    return true;
-
-  default:
-    LogError("The configuration option \"" + GetPath(key) +
-             "\" is not an integer as expected");
-
-    ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    std::string tmp;
+    if (LookupStringValue(tmp, key))
+    {
+      return tmp;
+    }
+    else
+    {
+      return defaultValue;
+    }
   }
-}
 
 
-bool OrthancConfiguration::LookupUnsignedIntegerValue(unsigned int& target,
-                                                      const std::string& key) const
-{
-  int tmp;
-  if (!LookupIntegerValue(tmp, key))
-  {
-    return false;
-  }
-
-  if (tmp < 0)
+  int OrthancConfiguration::GetIntegerValue(const std::string& key,
+                                            int defaultValue) const
   {
-    LogError("The configuration option \"" + GetPath(key) +
-             "\" is not a positive integer as expected");
-
-    ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
-  }
-  else
-  {
-    target = static_cast<unsigned int>(tmp);
-    return true;
-  }
-}
-
-
-bool OrthancConfiguration::LookupBooleanValue(bool& target,
-                                              const std::string& key) const
-{
-  assert(configuration_.type() == Json::objectValue);
-
-  if (!configuration_.isMember(key))
-  {
-    return false;
+    int tmp;
+    if (LookupIntegerValue(tmp, key))
+    {
+      return tmp;
+    }
+    else
+    {
+      return defaultValue;
+    }
   }
 
-  if (configuration_[key].type() != Json::booleanValue)
+
+  unsigned int OrthancConfiguration::GetUnsignedIntegerValue(const std::string& key,
+                                                             unsigned int defaultValue) const
   {
-    LogError("The configuration option \"" + GetPath(key) +
-             "\" is not a Boolean as expected");
-
-    ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    unsigned int tmp;
+    if (LookupUnsignedIntegerValue(tmp, key))
+    {
+      return tmp;
+    }
+    else
+    {
+      return defaultValue;
+    }
   }
 
-  target = configuration_[key].asBool();
-  return true;
-}
 
-
-bool OrthancConfiguration::LookupFloatValue(float& target,
-                                            const std::string& key) const
-{
-  assert(configuration_.type() == Json::objectValue);
-
-  if (!configuration_.isMember(key))
+  bool OrthancConfiguration::GetBooleanValue(const std::string& key,
+                                             bool defaultValue) const
   {
-    return false;
+    bool tmp;
+    if (LookupBooleanValue(tmp, key))
+    {
+      return tmp;
+    }
+    else
+    {
+      return defaultValue;
+    }
   }
 
-  switch (configuration_[key].type())
+
+  float OrthancConfiguration::GetFloatValue(const std::string& key,
+                                            float defaultValue) const
   {
-  case Json::realValue:
-    target = configuration_[key].asFloat();
-    return true;
-
-  case Json::intValue:
-    target = static_cast<float>(configuration_[key].asInt());
-    return true;
-
-  case Json::uintValue:
-    target = static_cast<float>(configuration_[key].asUInt());
-    return true;
-
-  default:
-    LogError("The configuration option \"" + GetPath(key) +
-             "\" is not an integer as expected");
-
-    ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    float tmp;
+    if (LookupFloatValue(tmp, key))
+    {
+      return tmp;
+    }
+    else
+    {
+      return defaultValue;
+    }
   }
-}
 
 
-bool OrthancConfiguration::LookupListOfStrings(std::list<std::string>& target,
-                                               const std::string& key,
-                                               bool allowSingleString) const
-{
-  assert(configuration_.type() == Json::objectValue);
-
-  target.clear();
-
-  if (!configuration_.isMember(key))
+  void OrthancConfiguration::GetDictionary(std::map<std::string, std::string>& target,
+                                           const std::string& key) const
   {
-    return false;
-  }
+    assert(configuration_.type() == Json::objectValue);
+
+    target.clear();
+
+    if (!configuration_.isMember(key))
+    {
+      return;
+    }
 
-  switch (configuration_[key].type())
-  {
-  case Json::arrayValue:
-  {
-    bool ok = true;
+    if (configuration_[key].type() != Json::objectValue)
+    {
+      LogError("The configuration option \"" + GetPath(key) +
+               "\" is not a string as expected");
+
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+    }
 
-    for (Json::Value::ArrayIndex i = 0; ok && i < configuration_[key].size(); i++)
+    Json::Value::Members members = configuration_[key].getMemberNames();
+
+    for (size_t i = 0; i < members.size(); i++)
     {
-      if (configuration_[key][i].type() == Json::stringValue)
+      const Json::Value& value = configuration_[key][members[i]];
+
+      if (value.type() == Json::stringValue)
       {
-        target.push_back(configuration_[key][i].asString());
+        target[members[i]] = value.asString();
       }
       else
       {
-        ok = false;
+        LogError("The configuration option \"" + GetPath(key) +
+                 "\" is not a dictionary mapping strings to strings");
+
+        ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
       }
     }
+  }
 
-    if (ok)
+
+  void OrthancImage::Clear()
+  {
+    if (image_ != NULL)
+    {
+      OrthancPluginFreeImage(GetGlobalContext(), image_);
+      image_ = NULL;
+    }
+  }
+
+
+  void OrthancImage::CheckImageAvailable()
+  {
+    if (image_ == NULL)
+    {
+      LogError("Trying to access a NULL image");
+      ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
+    }
+  }
+
+
+  OrthancImage::OrthancImage() :
+    image_(NULL)
+  {
+  }
+
+
+  OrthancImage::OrthancImage(OrthancPluginImage*  image) :
+    image_(image)
+  {
+  }
+
+
+  OrthancImage::OrthancImage(OrthancPluginPixelFormat  format,
+                             uint32_t                  width,
+                             uint32_t                  height)
+  {
+    image_ = OrthancPluginCreateImage(GetGlobalContext(), format, width, height);
+
+    if (image_ == NULL)
+    {
+      LogError("Cannot create an image");
+      ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    }
+  }
+
+
+  OrthancImage::OrthancImage(OrthancPluginPixelFormat  format,
+                             uint32_t                  width,
+                             uint32_t                  height,
+                             uint32_t                  pitch,
+                             void*                     buffer)
+  {
+    image_ = OrthancPluginCreateImageAccessor
+        (GetGlobalContext(), format, width, height, pitch, buffer);
+
+    if (image_ == NULL)
+    {
+      LogError("Cannot create an image accessor");
+      ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    }
+  }
+
+  void OrthancImage::UncompressPngImage(const void* data,
+                                        size_t size)
+  {
+    Clear();
+
+    image_ = OrthancPluginUncompressImage(GetGlobalContext(), data, size, OrthancPluginImageFormat_Png);
+
+    if (image_ == NULL)
+    {
+      LogError("Cannot uncompress a PNG image");
+      ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
+    }
+  }
+
+
+  void OrthancImage::UncompressJpegImage(const void* data,
+                                         size_t size)
+  {
+    Clear();
+    image_ = OrthancPluginUncompressImage(GetGlobalContext(), data, size, OrthancPluginImageFormat_Jpeg);
+    if (image_ == NULL)
+    {
+      LogError("Cannot uncompress a JPEG image");
+      ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
+    }
+  }
+
+
+  void OrthancImage::DecodeDicomImage(const void* data,
+                                      size_t size,
+                                      unsigned int frame)
+  {
+    Clear();
+    image_ = OrthancPluginDecodeDicomImage(GetGlobalContext(), data, size, frame);
+    if (image_ == NULL)
+    {
+      LogError("Cannot uncompress a DICOM image");
+      ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
+    }
+  }
+
+
+  OrthancPluginPixelFormat OrthancImage::GetPixelFormat()
+  {
+    CheckImageAvailable();
+    return OrthancPluginGetImagePixelFormat(GetGlobalContext(), image_);
+  }
+
+
+  unsigned int OrthancImage::GetWidth()
+  {
+    CheckImageAvailable();
+    return OrthancPluginGetImageWidth(GetGlobalContext(), image_);
+  }
+
+
+  unsigned int OrthancImage::GetHeight()
+  {
+    CheckImageAvailable();
+    return OrthancPluginGetImageHeight(GetGlobalContext(), image_);
+  }
+
+
+  unsigned int OrthancImage::GetPitch()
+  {
+    CheckImageAvailable();
+    return OrthancPluginGetImagePitch(GetGlobalContext(), image_);
+  }
+
+
+  const void* OrthancImage::GetBuffer()
+  {
+    CheckImageAvailable();
+    return OrthancPluginGetImageBuffer(GetGlobalContext(), image_);
+  }
+
+
+  void OrthancImage::CompressPngImage(MemoryBuffer& target)
+  {
+    CheckImageAvailable();
+
+    OrthancPluginMemoryBuffer tmp;
+    OrthancPluginCompressPngImage(GetGlobalContext(), &tmp, GetPixelFormat(),
+                                  GetWidth(), GetHeight(), GetPitch(), GetBuffer());
+
+    target.Assign(tmp);
+  }
+
+
+  void OrthancImage::CompressJpegImage(MemoryBuffer& target,
+                                       uint8_t quality)
+  {
+    CheckImageAvailable();
+
+    OrthancPluginMemoryBuffer tmp;
+    OrthancPluginCompressJpegImage(GetGlobalContext(), &tmp, GetPixelFormat(),
+                                   GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality);
+
+    target.Assign(tmp);
+  }
+
+
+  void OrthancImage::AnswerPngImage(OrthancPluginRestOutput* output)
+  {
+    CheckImageAvailable();
+    OrthancPluginCompressAndAnswerPngImage(GetGlobalContext(), output, GetPixelFormat(),
+                                           GetWidth(), GetHeight(), GetPitch(), GetBuffer());
+  }
+
+
+  void OrthancImage::AnswerJpegImage(OrthancPluginRestOutput* output,
+                                     uint8_t quality)
+  {
+    CheckImageAvailable();
+    OrthancPluginCompressAndAnswerJpegImage(GetGlobalContext(), output, GetPixelFormat(),
+                                            GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality);
+  }
+
+
+
+#if HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1
+  FindMatcher::FindMatcher(const OrthancPluginWorklistQuery* worklist) :
+    matcher_(NULL),
+    worklist_(worklist)
+  {
+    if (worklist_ == NULL)
+    {
+      ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
+    }
+  }
+
+
+  void FindMatcher::SetupDicom(const void*  query,
+                               uint32_t     size)
+  {
+    worklist_ = NULL;
+
+    matcher_ = OrthancPluginCreateFindMatcher(GetGlobalContext(), query, size);
+    if (matcher_ == NULL)
+    {
+      ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    }
+  }
+
+
+  FindMatcher::~FindMatcher()
+  {
+    // The "worklist_" field
+
+    if (matcher_ != NULL)
+    {
+      OrthancPluginFreeFindMatcher(GetGlobalContext(), matcher_);
+    }
+  }
+
+
+
+  bool FindMatcher::IsMatch(const void*  dicom,
+                            uint32_t     size) const
+  {
+    int32_t result;
+
+    if (matcher_ != NULL)
+    {
+      result = OrthancPluginFindMatcherIsMatch(GetGlobalContext(), matcher_, dicom, size);
+    }
+    else if (worklist_ != NULL)
+    {
+      result = OrthancPluginWorklistIsMatch(GetGlobalContext(), worklist_, dicom, size);
+    }
+    else
+    {
+      ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    }
+
+    if (result == 0)
+    {
+      return false;
+    }
+    else if (result == 1)
+    {
+      return true;
+    }
+    else
+    {
+      ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+    }
+  }
+
+#endif /* HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1 */
+
+  void AnswerJson(const Json::Value& value,
+                  OrthancPluginRestOutput* output
+                  )
+  {
+    Json::StyledWriter writer;
+    std::string bodyString = writer.write(value);
+
+    OrthancPluginAnswerBuffer(GetGlobalContext(), output, bodyString.c_str(), bodyString.size(), "application/json");
+  }
+
+  void AnswerString(const std::string& answer,
+                    const char* mimeType,
+                    OrthancPluginRestOutput* output
+                    )
+  {
+    OrthancPluginAnswerBuffer(GetGlobalContext(), output, answer.c_str(), answer.size(), mimeType);
+  }
+
+  void AnswerHttpError(uint16_t httpError, OrthancPluginRestOutput *output)
+  {
+    OrthancPluginSendHttpStatusCode(GetGlobalContext(), output, httpError);
+  }
+
+  void AnswerMethodNotAllowed(OrthancPluginRestOutput *output, const char* allowedMethods)
+  {
+    OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowedMethods);
+  }
+
+  bool RestApiGetString(std::string& result,
+                        const std::string& uri,
+                        bool applyPlugins)
+  {
+    MemoryBuffer answer;
+    if (!answer.RestApiGet(uri, applyPlugins))
+    {
+      return false;
+    }
+    else
+    {
+      answer.ToString(result);
+      return true;
+    }
+  }
+
+  bool RestApiGetString(std::string& result,
+                        const std::string& uri,
+                        const std::map<std::string, std::string>& httpHeaders,
+                        bool applyPlugins)
+  {
+    MemoryBuffer answer;
+    if (!answer.RestApiGet(uri, httpHeaders, applyPlugins))
+    {
+      return false;
+    }
+    else
+    {
+      answer.ToString(result);
+      return true;
+    }
+  }
+
+
+
+  bool RestApiGet(Json::Value& result,
+                  const std::string& uri,
+                  bool applyPlugins)
+  {
+    MemoryBuffer answer;
+
+    if (!answer.RestApiGet(uri, applyPlugins))
+    {
+      return false;
+    }
+    else
+    {
+      if (!answer.IsEmpty())
+      {
+        answer.ToJson(result);
+      }
+      return true;
+    }
+  }
+
+
+  bool RestApiPost(Json::Value& result,
+                   const std::string& uri,
+                   const char* body,
+                   size_t bodySize,
+                   bool applyPlugins)
+  {
+    MemoryBuffer answer;
+
+    if (!answer.RestApiPost(uri, body, bodySize, applyPlugins))
+    {
+      return false;
+    }
+    else
+    {
+      if (!answer.IsEmpty())
+      {
+        answer.ToJson(result);
+      }
+      return true;
+    }
+  }
+
+
+  bool RestApiPost(Json::Value& result,
+                   const std::string& uri,
+                   const Json::Value& body,
+                   bool applyPlugins)
+  {
+    Json::FastWriter writer;
+    return RestApiPost(result, uri, writer.write(body), applyPlugins);
+  }
+
+
+  bool RestApiPut(Json::Value& result,
+                  const std::string& uri,
+                  const char* body,
+                  size_t bodySize,
+                  bool applyPlugins)
+  {
+    MemoryBuffer answer;
+
+    if (!answer.RestApiPut(uri, body, bodySize, applyPlugins))
+    {
+      return false;
+    }
+    else
+    {
+      if (!answer.IsEmpty()) // i.e, on a PUT to metadata/..., orthand returns an empty response
+      {
+        answer.ToJson(result);
+      }
+      return true;
+    }
+  }
+
+
+  bool RestApiPut(Json::Value& result,
+                  const std::string& uri,
+                  const Json::Value& body,
+                  bool applyPlugins)
+  {
+    Json::FastWriter writer;
+    return RestApiPut(result, uri, writer.write(body), applyPlugins);
+  }
+
+
+  bool RestApiDelete(const std::string& uri,
+                     bool applyPlugins)
+  {
+    OrthancPluginErrorCode error;
+
+    if (applyPlugins)
+    {
+      error = OrthancPluginRestApiDeleteAfterPlugins(GetGlobalContext(), uri.c_str());
+    }
+    else
+    {
+      error = OrthancPluginRestApiDelete(GetGlobalContext(), uri.c_str());
+    }
+
+    if (error == OrthancPluginErrorCode_Success)
+    {
+      return true;
+    }
+    else if (error == OrthancPluginErrorCode_UnknownResource ||
+             error == OrthancPluginErrorCode_InexistentItem)
+    {
+      return false;
+    }
+    else
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error);
+    }
+  }
+
+
+  void ReportMinimalOrthancVersion(unsigned int major,
+                                   unsigned int minor,
+                                   unsigned int revision)
+  {
+    LogError("Your version of the Orthanc core (" +
+             std::string(GetGlobalContext()->orthancVersion) +
+             ") is too old to run this plugin (version " +
+             boost::lexical_cast<std::string>(major) + "." +
+             boost::lexical_cast<std::string>(minor) + "." +
+             boost::lexical_cast<std::string>(revision) +
+             " is required)");
+  }
+
+
+  bool CheckMinimalOrthancVersion(unsigned int major,
+                                  unsigned int minor,
+                                  unsigned int revision)
+  {
+    if (!HasGlobalContext())
+    {
+      LogError("Bad Orthanc context in the plugin");
+      return false;
+    }
+
+    if (!strcmp(GetGlobalContext()->orthancVersion, "mainline"))
+    {
+      // Assume compatibility with the mainline
+      return true;
+    }
+
+    // Parse the version of the Orthanc core
+    int aa, bb, cc;
+    if (
+    #ifdef _MSC_VER
+        sscanf_s
+    #else
+        sscanf
+    #endif
+        (GetGlobalContext()->orthancVersion, "%4d.%4d.%4d", &aa, &bb, &cc) != 3 ||
+        aa < 0 ||
+        bb < 0 ||
+        cc < 0)
+    {
+      return false;
+    }
+
+    unsigned int a = static_cast<unsigned int>(aa);
+    unsigned int b = static_cast<unsigned int>(bb);
+    unsigned int c = static_cast<unsigned int>(cc);
+
+    // Check the major version number
+
+    if (a > major)
     {
       return true;
     }
 
-    break;
-  }
+    if (a < major)
+    {
+      return false;
+    }
+
 
-  case Json::stringValue:
-    if (allowSingleString)
+    // Check the minor version number
+    assert(a == major);
+
+    if (b > minor)
     {
-      target.push_back(configuration_[key].asString());
       return true;
     }
 
-    break;
-
-  default:
-    break;
-  }
-
-  LogError("The configuration option \"" + GetPath(key) +
-           "\" is not a list of strings as expected");
-
-  ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
-}
-
-
-bool OrthancConfiguration::LookupSetOfStrings(std::set<std::string>& target,
-                                              const std::string& key,
-                                              bool allowSingleString) const
-{
-  std::list<std::string> lst;
-
-  if (LookupListOfStrings(lst, key, allowSingleString))
-  {
-    target.clear();
-
-    for (std::list<std::string>::const_iterator
-         it = lst.begin(); it != lst.end(); ++it)
+    if (b < minor)
     {
-      target.insert(*it);
+      return false;
     }
 
-    return true;
-  }
-  else
-  {
-    return false;
-  }
-}
-
-
-std::string OrthancConfiguration::GetStringValue(const std::string& key,
-                                                 const std::string& defaultValue) const
-{
-  std::string tmp;
-  if (LookupStringValue(tmp, key))
-  {
-    return tmp;
-  }
-  else
-  {
-    return defaultValue;
-  }
-}
-
-
-int OrthancConfiguration::GetIntegerValue(const std::string& key,
-                                          int defaultValue) const
-{
-  int tmp;
-  if (LookupIntegerValue(tmp, key))
-  {
-    return tmp;
-  }
-  else
-  {
-    return defaultValue;
-  }
-}
-
-
-unsigned int OrthancConfiguration::GetUnsignedIntegerValue(const std::string& key,
-                                                           unsigned int defaultValue) const
-{
-  unsigned int tmp;
-  if (LookupUnsignedIntegerValue(tmp, key))
-  {
-    return tmp;
-  }
-  else
-  {
-    return defaultValue;
-  }
-}
-
+    // Check the patch level version number
+    assert(a == major && b == minor);
 
-bool OrthancConfiguration::GetBooleanValue(const std::string& key,
-                                           bool defaultValue) const
-{
-  bool tmp;
-  if (LookupBooleanValue(tmp, key))
-  {
-    return tmp;
-  }
-  else
-  {
-    return defaultValue;
-  }
-}
-
-
-float OrthancConfiguration::GetFloatValue(const std::string& key,
-                                          float defaultValue) const
-{
-  float tmp;
-  if (LookupFloatValue(tmp, key))
-  {
-    return tmp;
-  }
-  else
-  {
-    return defaultValue;
-  }
-}
-
-
-void OrthancConfiguration::GetDictionary(std::map<std::string, std::string>& target,
-                                         const std::string& key) const
-{
-  assert(configuration_.type() == Json::objectValue);
-
-  target.clear();
-
-  if (!configuration_.isMember(key))
-  {
-    return;
-  }
-
-  if (configuration_[key].type() != Json::objectValue)
-  {
-    LogError("The configuration option \"" + GetPath(key) +
-             "\" is not a string as expected");
-
-    ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
-  }
-
-  Json::Value::Members members = configuration_[key].getMemberNames();
-
-  for (size_t i = 0; i < members.size(); i++)
-  {
-    const Json::Value& value = configuration_[key][members[i]];
-
-    if (value.type() == Json::stringValue)
+    if (c >= revision)
     {
-      target[members[i]] = value.asString();
+      return true;
     }
     else
     {
-      LogError("The configuration option \"" + GetPath(key) +
-               "\" is not a dictionary mapping strings to strings");
-
-      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
+      return false;
     }
   }
-}
-
-
-void OrthancImage::Clear()
-{
-  if (image_ != NULL)
-  {
-    OrthancPluginFreeImage(GetGlobalContext(), image_);
-    image_ = NULL;
-  }
-}
-
-
-void OrthancImage::CheckImageAvailable()
-{
-  if (image_ == NULL)
-  {
-    LogError("Trying to access a NULL image");
-    ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
-  }
-}
-
-
-OrthancImage::OrthancImage() :
-  image_(NULL)
-{
-}
-
-
-OrthancImage::OrthancImage(OrthancPluginImage*  image) :
-  image_(image)
-{
-}
-
-
-OrthancImage::OrthancImage(OrthancPluginPixelFormat  format,
-                           uint32_t                  width,
-                           uint32_t                  height)
-{
-  image_ = OrthancPluginCreateImage(GetGlobalContext(), format, width, height);
-
-  if (image_ == NULL)
-  {
-    LogError("Cannot create an image");
-    ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
-  }
-}
-
-
-OrthancImage::OrthancImage(OrthancPluginPixelFormat  format,
-                           uint32_t                  width,
-                           uint32_t                  height,
-                           uint32_t                  pitch,
-                           void*                     buffer)
-{
-  image_ = OrthancPluginCreateImageAccessor
-      (GetGlobalContext(), format, width, height, pitch, buffer);
-
-  if (image_ == NULL)
-  {
-    LogError("Cannot create an image accessor");
-    ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
-  }
-}
-
-void OrthancImage::UncompressPngImage(const void* data,
-                                      size_t size)
-{
-  Clear();
-
-  image_ = OrthancPluginUncompressImage(GetGlobalContext(), data, size, OrthancPluginImageFormat_Png);
-
-  if (image_ == NULL)
-  {
-    LogError("Cannot uncompress a PNG image");
-    ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
-  }
-}
-
-
-void OrthancImage::UncompressJpegImage(const void* data,
-                                       size_t size)
-{
-  Clear();
-  image_ = OrthancPluginUncompressImage(GetGlobalContext(), data, size, OrthancPluginImageFormat_Jpeg);
-  if (image_ == NULL)
-  {
-    LogError("Cannot uncompress a JPEG image");
-    ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
-  }
-}
-
-
-void OrthancImage::DecodeDicomImage(const void* data,
-                                    size_t size,
-                                    unsigned int frame)
-{
-  Clear();
-  image_ = OrthancPluginDecodeDicomImage(GetGlobalContext(), data, size, frame);
-  if (image_ == NULL)
-  {
-    LogError("Cannot uncompress a DICOM image");
-    ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
-  }
-}
-
-
-OrthancPluginPixelFormat OrthancImage::GetPixelFormat()
-{
-  CheckImageAvailable();
-  return OrthancPluginGetImagePixelFormat(GetGlobalContext(), image_);
-}
-
-
-unsigned int OrthancImage::GetWidth()
-{
-  CheckImageAvailable();
-  return OrthancPluginGetImageWidth(GetGlobalContext(), image_);
-}
-
-
-unsigned int OrthancImage::GetHeight()
-{
-  CheckImageAvailable();
-  return OrthancPluginGetImageHeight(GetGlobalContext(), image_);
-}
-
-
-unsigned int OrthancImage::GetPitch()
-{
-  CheckImageAvailable();
-  return OrthancPluginGetImagePitch(GetGlobalContext(), image_);
-}
-
-
-const void* OrthancImage::GetBuffer()
-{
-  CheckImageAvailable();
-  return OrthancPluginGetImageBuffer(GetGlobalContext(), image_);
-}
-
-
-void OrthancImage::CompressPngImage(MemoryBuffer& target)
-{
-  CheckImageAvailable();
-
-  OrthancPluginMemoryBuffer tmp;
-  OrthancPluginCompressPngImage(GetGlobalContext(), &tmp, GetPixelFormat(),
-                                GetWidth(), GetHeight(), GetPitch(), GetBuffer());
-
-  target.Assign(tmp);
-}
-
-
-void OrthancImage::CompressJpegImage(MemoryBuffer& target,
-                                     uint8_t quality)
-{
-  CheckImageAvailable();
-
-  OrthancPluginMemoryBuffer tmp;
-  OrthancPluginCompressJpegImage(GetGlobalContext(), &tmp, GetPixelFormat(),
-                                 GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality);
-
-  target.Assign(tmp);
-}
-
-
-void OrthancImage::AnswerPngImage(OrthancPluginRestOutput* output)
-{
-  CheckImageAvailable();
-  OrthancPluginCompressAndAnswerPngImage(GetGlobalContext(), output, GetPixelFormat(),
-                                         GetWidth(), GetHeight(), GetPitch(), GetBuffer());
-}
-
-
-void OrthancImage::AnswerJpegImage(OrthancPluginRestOutput* output,
-                                   uint8_t quality)
-{
-  CheckImageAvailable();
-  OrthancPluginCompressAndAnswerJpegImage(GetGlobalContext(), output, GetPixelFormat(),
-                                          GetWidth(), GetHeight(), GetPitch(), GetBuffer(), quality);
-}
-
-
-
-#if HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1
-FindMatcher::FindMatcher(const OrthancPluginWorklistQuery* worklist) :
-  matcher_(NULL),
-  worklist_(worklist)
-{
-  if (worklist_ == NULL)
-  {
-    ORTHANC_PLUGINS_THROW_EXCEPTION(ParameterOutOfRange);
-  }
-}
-
-
-void FindMatcher::SetupDicom(const void*  query,
-                             uint32_t     size)
-{
-  worklist_ = NULL;
-
-  matcher_ = OrthancPluginCreateFindMatcher(GetGlobalContext(), query, size);
-  if (matcher_ == NULL)
-  {
-    ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
-  }
-}
-
-
-FindMatcher::~FindMatcher()
-{
-  // The "worklist_" field
-
-  if (matcher_ != NULL)
-  {
-    OrthancPluginFreeFindMatcher(GetGlobalContext(), matcher_);
-  }
-}
-
-
-
-bool FindMatcher::IsMatch(const void*  dicom,
-                          uint32_t     size) const
-{
-  int32_t result;
-
-  if (matcher_ != NULL)
-  {
-    result = OrthancPluginFindMatcherIsMatch(GetGlobalContext(), matcher_, dicom, size);
-  }
-  else if (worklist_ != NULL)
-  {
-    result = OrthancPluginWorklistIsMatch(GetGlobalContext(), worklist_, dicom, size);
-  }
-  else
-  {
-    ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
-  }
-
-  if (result == 0)
-  {
-    return false;
-  }
-  else if (result == 1)
-  {
-    return true;
-  }
-  else
-  {
-    ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
-  }
-}
-
-#endif /* HAS_ORTHANC_PLUGIN_FIND_MATCHER == 1 */
-
-void AnswerJson(const Json::Value& value,
-                OrthancPluginRestOutput* output
-                )
-{
-  Json::StyledWriter writer;
-  std::string bodyString = writer.write(value);
-
-  OrthancPluginAnswerBuffer(GetGlobalContext(), output, bodyString.c_str(), bodyString.size(), "application/json");
-}
-
-void AnswerString(const std::string& answer,
-                  const char* mimeType,
-                  OrthancPluginRestOutput* output
-                  )
-{
-  OrthancPluginAnswerBuffer(GetGlobalContext(), output, answer.c_str(), answer.size(), mimeType);
-}
-
-void AnswerHttpError(uint16_t httpError, OrthancPluginRestOutput *output)
-{
-  OrthancPluginSendHttpStatusCode(GetGlobalContext(), output, httpError);
-}
-
-void AnswerMethodNotAllowed(OrthancPluginRestOutput *output, const char* allowedMethods)
-{
-  OrthancPluginSendMethodNotAllowed(GetGlobalContext(), output, allowedMethods);
-}
-
-bool RestApiGetString(std::string& result,
-                      const std::string& uri,
-                      bool applyPlugins)
-{
-  MemoryBuffer answer;
-  if (!answer.RestApiGet(uri, applyPlugins))
-  {
-    return false;
-  }
-  else
-  {
-    answer.ToString(result);
-    return true;
-  }
-}
-
-bool RestApiGetString(std::string& result,
-                      const std::string& uri,
-                      const std::map<std::string, std::string>& httpHeaders,
-                      bool applyPlugins)
-{
-  MemoryBuffer answer;
-  if (!answer.RestApiGet(uri, httpHeaders, applyPlugins))
-  {
-    return false;
-  }
-  else
-  {
-    answer.ToString(result);
-    return true;
-  }
-}
-
-
-
-bool RestApiGet(Json::Value& result,
-                const std::string& uri,
-                bool applyPlugins)
-{
-  MemoryBuffer answer;
-
-  if (!answer.RestApiGet(uri, applyPlugins))
-  {
-    return false;
-  }
-  else
-  {
-    if (!answer.IsEmpty())
-    {
-      answer.ToJson(result);
-    }
-    return true;
-  }
-}
-
-
-bool RestApiPost(Json::Value& result,
-                 const std::string& uri,
-                 const char* body,
-                 size_t bodySize,
-                 bool applyPlugins)
-{
-  MemoryBuffer answer;
-
-  if (!answer.RestApiPost(uri, body, bodySize, applyPlugins))
-  {
-    return false;
-  }
-  else
-  {
-    if (!answer.IsEmpty())
-    {
-      answer.ToJson(result);
-    }
-    return true;
-  }
-}
-
-
-bool RestApiPost(Json::Value& result,
-                 const std::string& uri,
-                 const Json::Value& body,
-                 bool applyPlugins)
-{
-  Json::FastWriter writer;
-  return RestApiPost(result, uri, writer.write(body), applyPlugins);
-}
-
-
-bool RestApiPut(Json::Value& result,
-                const std::string& uri,
-                const char* body,
-                size_t bodySize,
-                bool applyPlugins)
-{
-  MemoryBuffer answer;
-
-  if (!answer.RestApiPut(uri, body, bodySize, applyPlugins))
-  {
-    return false;
-  }
-  else
-  {
-    if (!answer.IsEmpty()) // i.e, on a PUT to metadata/..., orthand returns an empty response
-    {
-      answer.ToJson(result);
-    }
-    return true;
-  }
-}
-
-
-bool RestApiPut(Json::Value& result,
-                const std::string& uri,
-                const Json::Value& body,
-                bool applyPlugins)
-{
-  Json::FastWriter writer;
-  return RestApiPut(result, uri, writer.write(body), applyPlugins);
-}
-
-
-bool RestApiDelete(const std::string& uri,
-                   bool applyPlugins)
-{
-  OrthancPluginErrorCode error;
-
-  if (applyPlugins)
-  {
-    error = OrthancPluginRestApiDeleteAfterPlugins(GetGlobalContext(), uri.c_str());
-  }
-  else
-  {
-    error = OrthancPluginRestApiDelete(GetGlobalContext(), uri.c_str());
-  }
-
-  if (error == OrthancPluginErrorCode_Success)
-  {
-    return true;
-  }
-  else if (error == OrthancPluginErrorCode_UnknownResource ||
-           error == OrthancPluginErrorCode_InexistentItem)
-  {
-    return false;
-  }
-  else
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(error);
-  }
-}
-
-
-void ReportMinimalOrthancVersion(unsigned int major,
-                                 unsigned int minor,
-                                 unsigned int revision)
-{
-  LogError("Your version of the Orthanc core (" +
-           std::string(GetGlobalContext()->orthancVersion) +
-           ") is too old to run this plugin (version " +
-           boost::lexical_cast<std::string>(major) + "." +
-           boost::lexical_cast<std::string>(minor) + "." +
-           boost::lexical_cast<std::string>(revision) +
-           " is required)");
-}
-
-
-bool CheckMinimalOrthancVersion(unsigned int major,
-                                unsigned int minor,
-                                unsigned int revision)
-{
-  if (!HasGlobalContext())
-  {
-    LogError("Bad Orthanc context in the plugin");
-    return false;
-  }
-
-  if (!strcmp(GetGlobalContext()->orthancVersion, "mainline"))
-  {
-    // Assume compatibility with the mainline
-    return true;
-  }
-
-  // Parse the version of the Orthanc core
-  int aa, bb, cc;
-  if (
-    #ifdef _MSC_VER
-      sscanf_s
-    #else
-      sscanf
-    #endif
-      (GetGlobalContext()->orthancVersion, "%4d.%4d.%4d", &aa, &bb, &cc) != 3 ||
-      aa < 0 ||
-      bb < 0 ||
-      cc < 0)
-  {
-    return false;
-  }
-
-  unsigned int a = static_cast<unsigned int>(aa);
-  unsigned int b = static_cast<unsigned int>(bb);
-  unsigned int c = static_cast<unsigned int>(cc);
-
-  // Check the major version number
-
-  if (a > major)
-  {
-    return true;
-  }
-
-  if (a < major)
-  {
-    return false;
-  }
 
 
-  // Check the minor version number
-  assert(a == major);
-
-  if (b > minor)
-  {
-    return true;
-  }
-
-  if (b < minor)
+#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 0)
+  const char* AutodetectMimeType(const std::string& path)
   {
-    return false;
-  }
+    const char* mime = OrthancPluginAutodetectMimeType(GetGlobalContext(), path.c_str());
 
-  // Check the patch level version number
-  assert(a == major && b == minor);
-
-  if (c >= revision)
-  {
-    return true;
+    if (mime == NULL)
+    {
+      // Should never happen, just for safety
+      return "application/octet-stream";
+    }
+    else
+    {
+      return mime;
+    }
   }
-  else
-  {
-    return false;
-  }
-}
-
-
-#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 0)
-const char* AutodetectMimeType(const std::string& path)
-{
-  const char* mime = OrthancPluginAutodetectMimeType(GetGlobalContext(), path.c_str());
-
-  if (mime == NULL)
-  {
-    // Should never happen, just for safety
-    return "application/octet-stream";
-  }
-  else
-  {
-    return mime;
-  }
-}
 #endif
 
 
 #if HAS_ORTHANC_PLUGIN_PEERS == 1
-size_t OrthancPeers::GetPeerIndex(const std::string& name) const
-{
-  size_t index;
-  if (LookupName(index, name))
+  size_t OrthancPeers::GetPeerIndex(const std::string& name) const
   {
-    return index;
+    size_t index;
+    if (LookupName(index, name))
+    {
+      return index;
+    }
+    else
+    {
+      LogError("Inexistent peer: " + name);
+      ORTHANC_PLUGINS_THROW_EXCEPTION(UnknownResource);
+    }
   }
-  else
-  {
-    LogError("Inexistent peer: " + name);
-    ORTHANC_PLUGINS_THROW_EXCEPTION(UnknownResource);
-  }
-}
 
 
-OrthancPeers::OrthancPeers() :
-  peers_(NULL),
-  timeout_(0)
-{
-  peers_ = OrthancPluginGetPeers(GetGlobalContext());
-
-  if (peers_ == NULL)
+  OrthancPeers::OrthancPeers() :
+    peers_(NULL),
+    timeout_(0)
   {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin);
-  }
-
-  uint32_t count = OrthancPluginGetPeersCount(GetGlobalContext(), peers_);
+    peers_ = OrthancPluginGetPeers(GetGlobalContext());
 
-  for (uint32_t i = 0; i < count; i++)
-  {
-    const char* name = OrthancPluginGetPeerName(GetGlobalContext(), peers_, i);
-    if (name == NULL)
+    if (peers_ == NULL)
     {
-      OrthancPluginFreePeers(GetGlobalContext(), peers_);
       ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin);
     }
 
-    index_[name] = i;
+    uint32_t count = OrthancPluginGetPeersCount(GetGlobalContext(), peers_);
+
+    for (uint32_t i = 0; i < count; i++)
+    {
+      const char* name = OrthancPluginGetPeerName(GetGlobalContext(), peers_, i);
+      if (name == NULL)
+      {
+        OrthancPluginFreePeers(GetGlobalContext(), peers_);
+        ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin);
+      }
+
+      index_[name] = i;
+    }
+  }
+
+
+  OrthancPeers::~OrthancPeers()
+  {
+    if (peers_ != NULL)
+    {
+      OrthancPluginFreePeers(GetGlobalContext(), peers_);
+    }
+  }
+
+
+  bool OrthancPeers::LookupName(size_t& target,
+                                const std::string& name) const
+  {
+    Index::const_iterator found = index_.find(name);
+
+    if (found == index_.end())
+    {
+      return false;
+    }
+    else
+    {
+      target = found->second;
+      return true;
+    }
   }
-}
+
+
+  std::string OrthancPeers::GetPeerName(size_t index) const
+  {
+    if (index >= index_.size())
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
+    }
+    else
+    {
+      const char* s = OrthancPluginGetPeerName(GetGlobalContext(), peers_, static_cast<uint32_t>(index));
+      if (s == NULL)
+      {
+        ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin);
+      }
+      else
+      {
+        return s;
+      }
+    }
+  }
+
+
+  std::string OrthancPeers::GetPeerUrl(size_t index) const
+  {
+    if (index >= index_.size())
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
+    }
+    else
+    {
+      const char* s = OrthancPluginGetPeerUrl(GetGlobalContext(), peers_, static_cast<uint32_t>(index));
+      if (s == NULL)
+      {
+        ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin);
+      }
+      else
+      {
+        return s;
+      }
+    }
+  }
+
+
+  std::string OrthancPeers::GetPeerUrl(const std::string& name) const
+  {
+    return GetPeerUrl(GetPeerIndex(name));
+  }
+
+
+  bool OrthancPeers::LookupUserProperty(std::string& value,
+                                        size_t index,
+                                        const std::string& key) const
+  {
+    if (index >= index_.size())
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
+    }
+    else
+    {
+      const char* s = OrthancPluginGetPeerUserProperty(GetGlobalContext(), peers_, static_cast<uint32_t>(index), key.c_str());
+      if (s == NULL)
+      {
+        return false;
+      }
+      else
+      {
+        value.assign(s);
+        return true;
+      }
+    }
+  }
+
+
+  bool OrthancPeers::LookupUserProperty(std::string& value,
+                                        const std::string& peer,
+                                        const std::string& key) const
+  {
+    return LookupUserProperty(value, GetPeerIndex(peer), key);
+  }
 
 
-OrthancPeers::~OrthancPeers()
-{
-  if (peers_ != NULL)
+  bool OrthancPeers::DoGet(MemoryBuffer& target,
+                           size_t index,
+                           const std::string& uri) const
+  {
+    if (index >= index_.size())
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
+    }
+
+    OrthancPluginMemoryBuffer answer;
+    uint16_t status;
+    OrthancPluginErrorCode code = OrthancPluginCallPeerApi
+        (GetGlobalContext(), &answer, NULL, &status, peers_,
+         static_cast<uint32_t>(index), OrthancPluginHttpMethod_Get, uri.c_str(),
+         0, NULL, NULL, NULL, 0, timeout_);
+
+    if (code == OrthancPluginErrorCode_Success)
+    {
+      target.Assign(answer);
+      return (status == 200);
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+
+  bool OrthancPeers::DoGet(MemoryBuffer& target,
+                           const std::string& name,
+                           const std::string& uri) const
+  {
+    size_t index;
+    return (LookupName(index, name) &&
+            DoGet(target, index, uri));
+  }
+
+
+  bool OrthancPeers::DoGet(Json::Value& target,
+                           size_t index,
+                           const std::string& uri) const
+  {
+    MemoryBuffer buffer;
+
+    if (DoGet(buffer, index, uri))
+    {
+      buffer.ToJson(target);
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+
+  bool OrthancPeers::DoGet(Json::Value& target,
+                           const std::string& name,
+                           const std::string& uri) const
   {
-    OrthancPluginFreePeers(GetGlobalContext(), peers_);
+    MemoryBuffer buffer;
+
+    if (DoGet(buffer, name, uri))
+    {
+      buffer.ToJson(target);
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+
+  bool OrthancPeers::DoPost(MemoryBuffer& target,
+                            const std::string& name,
+                            const std::string& uri,
+                            const std::string& body) const
+  {
+    size_t index;
+    return (LookupName(index, name) &&
+            DoPost(target, index, uri, body));
+  }
+
+
+  bool OrthancPeers::DoPost(Json::Value& target,
+                            size_t index,
+                            const std::string& uri,
+                            const std::string& body) const
+  {
+    MemoryBuffer buffer;
+
+    if (DoPost(buffer, index, uri, body))
+    {
+      buffer.ToJson(target);
+      return true;
+    }
+    else
+    {
+      return false;
+    }
   }
-}
+
+
+  bool OrthancPeers::DoPost(Json::Value& target,
+                            const std::string& name,
+                            const std::string& uri,
+                            const std::string& body) const
+  {
+    MemoryBuffer buffer;
+
+    if (DoPost(buffer, name, uri, body))
+    {
+      buffer.ToJson(target);
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+
+  bool OrthancPeers::DoPost(MemoryBuffer& target,
+                            size_t index,
+                            const std::string& uri,
+                            const std::string& body) const
+  {
+    if (index >= index_.size())
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
+    }
+
+    OrthancPluginMemoryBuffer answer;
+    uint16_t status;
+    OrthancPluginErrorCode code = OrthancPluginCallPeerApi
+        (GetGlobalContext(), &answer, NULL, &status, peers_,
+         static_cast<uint32_t>(index), OrthancPluginHttpMethod_Post, uri.c_str(),
+         0, NULL, NULL, body.empty() ? NULL : body.c_str(), body.size(), timeout_);
+
+    if (code == OrthancPluginErrorCode_Success)
+    {
+      target.Assign(answer);
+      return (status == 200);
+    }
+    else
+    {
+      return false;
+    }
+  }
 
 
-bool OrthancPeers::LookupName(size_t& target,
-                              const std::string& name) const
-{
-  Index::const_iterator found = index_.find(name);
+  bool OrthancPeers::DoPut(size_t index,
+                           const std::string& uri,
+                           const std::string& body) const
+  {
+    if (index >= index_.size())
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
+    }
+
+    OrthancPluginMemoryBuffer answer;
+    uint16_t status;
+    OrthancPluginErrorCode code = OrthancPluginCallPeerApi
+        (GetGlobalContext(), &answer, NULL, &status, peers_,
+         static_cast<uint32_t>(index), OrthancPluginHttpMethod_Put, uri.c_str(),
+         0, NULL, NULL, body.empty() ? NULL : body.c_str(), body.size(), timeout_);
 
-  if (found == index_.end())
+    if (code == OrthancPluginErrorCode_Success)
+    {
+      OrthancPluginFreeMemoryBuffer(GetGlobalContext(), &answer);
+      return (status == 200);
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+
+  bool OrthancPeers::DoPut(const std::string& name,
+                           const std::string& uri,
+                           const std::string& body) const
+  {
+    size_t index;
+    return (LookupName(index, name) &&
+            DoPut(index, uri, body));
+  }
+
+
+  bool OrthancPeers::DoDelete(size_t index,
+                              const std::string& uri) const
   {
-    return false;
+    if (index >= index_.size())
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
+    }
+
+    OrthancPluginMemoryBuffer answer;
+    uint16_t status;
+    OrthancPluginErrorCode code = OrthancPluginCallPeerApi
+        (GetGlobalContext(), &answer, NULL, &status, peers_,
+         static_cast<uint32_t>(index), OrthancPluginHttpMethod_Put, uri.c_str(),
+         0, NULL, NULL, NULL, 0, timeout_);
+
+    if (code == OrthancPluginErrorCode_Success)
+    {
+      OrthancPluginFreeMemoryBuffer(GetGlobalContext(), &answer);
+      return (status == 200);
+    }
+    else
+    {
+      return false;
+    }
   }
-  else
+
+
+  bool OrthancPeers::DoDelete(const std::string& name,
+                              const std::string& uri) const
   {
-    target = found->second;
-    return true;
+    size_t index;
+    return (LookupName(index, name) &&
+            DoDelete(index, uri));
+  }
+#endif
+
+
+
+#if HAS_ORTHANC_PLUGIN_JOB == 1
+  void OrthancJob::CallbackFinalize(void* job)
+  {
+    if (job != NULL)
+    {
+      delete reinterpret_cast<OrthancJob*>(job);
+    }
   }
-}
+
+
+  float OrthancJob::CallbackGetProgress(void* job)
+  {
+    assert(job != NULL);
+
+    try
+    {
+      return reinterpret_cast<OrthancJob*>(job)->progress_;
+    }
+    catch (...)
+    {
+      return 0;
+    }
+  }
+
+
+  const char* OrthancJob::CallbackGetContent(void* job)
+  {
+    assert(job != NULL);
+
+    try
+    {
+      return reinterpret_cast<OrthancJob*>(job)->content_.c_str();
+    }
+    catch (...)
+    {
+      return 0;
+    }
+  }
 
 
-std::string OrthancPeers::GetPeerName(size_t index) const
-{
-  if (index >= index_.size())
+  const char* OrthancJob::CallbackGetSerialized(void* job)
+  {
+    assert(job != NULL);
+
+    try
+    {
+      const OrthancJob& tmp = *reinterpret_cast<OrthancJob*>(job);
+
+      if (tmp.hasSerialized_)
+      {
+        return tmp.serialized_.c_str();
+      }
+      else
+      {
+        return NULL;
+      }
+    }
+    catch (...)
+    {
+      return 0;
+    }
+  }
+
+
+  OrthancPluginJobStepStatus OrthancJob::CallbackStep(void* job)
+  {
+    assert(job != NULL);
+
+    try
+    {
+      return reinterpret_cast<OrthancJob*>(job)->Step();
+    }
+    catch (ORTHANC_PLUGINS_EXCEPTION_CLASS&)
+    {
+      return OrthancPluginJobStepStatus_Failure;
+    }
+    catch (...)
+    {
+      return OrthancPluginJobStepStatus_Failure;
+    }
+  }
+
+
+  OrthancPluginErrorCode OrthancJob::CallbackStop(void* job,
+                                                  OrthancPluginJobStopReason reason)
+  {
+    assert(job != NULL);
+
+    try
+    {
+      reinterpret_cast<OrthancJob*>(job)->Stop(reason);
+      return OrthancPluginErrorCode_Success;
+    }
+    catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e)
+    {
+      return static_cast<OrthancPluginErrorCode>(e.GetErrorCode());
+    }
+    catch (...)
+    {
+      return OrthancPluginErrorCode_Plugin;
+    }
+  }
+
+
+  OrthancPluginErrorCode OrthancJob::CallbackReset(void* job)
   {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
+    assert(job != NULL);
+
+    try
+    {
+      reinterpret_cast<OrthancJob*>(job)->Reset();
+      return OrthancPluginErrorCode_Success;
+    }
+    catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e)
+    {
+      return static_cast<OrthancPluginErrorCode>(e.GetErrorCode());
+    }
+    catch (...)
+    {
+      return OrthancPluginErrorCode_Plugin;
+    }
+  }
+
+
+  void OrthancJob::ClearContent()
+  {
+    Json::Value empty = Json::objectValue;
+    UpdateContent(empty);
+  }
+
+
+  void OrthancJob::UpdateContent(const Json::Value& content)
+  {
+    if (content.type() != Json::objectValue)
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_BadFileFormat);
+    }
+    else
+    {
+      Json::FastWriter writer;
+      content_ = writer.write(content);
+    }
+  }
+
+
+  void OrthancJob::ClearSerialized()
+  {
+    hasSerialized_ = false;
+    serialized_.clear();
   }
-  else
+
+
+  void OrthancJob::UpdateSerialized(const Json::Value& serialized)
+  {
+    if (serialized.type() != Json::objectValue)
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_BadFileFormat);
+    }
+    else
+    {
+      Json::FastWriter writer;
+      serialized_ = writer.write(serialized);
+      hasSerialized_ = true;
+    }
+  }
+
+
+  void OrthancJob::UpdateProgress(float progress)
   {
-    const char* s = OrthancPluginGetPeerName(GetGlobalContext(), peers_, static_cast<uint32_t>(index));
-    if (s == NULL)
+    if (progress < 0 ||
+        progress > 1)
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
+    }
+
+    progress_ = progress;
+  }
+
+
+  OrthancJob::OrthancJob(const std::string& jobType) :
+    jobType_(jobType),
+    progress_(0)
+  {
+    ClearContent();
+    ClearSerialized();
+  }
+
+
+  OrthancPluginJob* OrthancJob::Create(OrthancJob* job)
+  {
+    if (job == NULL)
+    {
+      ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_NullPointer);
+    }
+
+    OrthancPluginJob* orthanc = OrthancPluginCreateJob(
+          GetGlobalContext(), job, CallbackFinalize, job->jobType_.c_str(),
+          CallbackGetProgress, CallbackGetContent, CallbackGetSerialized,
+          CallbackStep, CallbackStop, CallbackReset);
+
+    if (orthanc == NULL)
     {
       ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin);
     }
     else
     {
-      return s;
+      return orthanc;
     }
   }
-}
 
 
-std::string OrthancPeers::GetPeerUrl(size_t index) const
-{
-  if (index >= index_.size())
+  std::string OrthancJob::Submit(OrthancJob* job,
+                                 int priority)
   {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
-  }
-  else
-  {
-    const char* s = OrthancPluginGetPeerUrl(GetGlobalContext(), peers_, static_cast<uint32_t>(index));
-    if (s == NULL)
+    OrthancPluginJob* orthanc = Create(job);
+
+    char* id = OrthancPluginSubmitJob(GetGlobalContext(), orthanc, priority);
+
+    if (id == NULL)
     {
+      LogError("Plugin cannot submit job");
+      OrthancPluginFreeJob(GetGlobalContext(), orthanc);
       ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin);
     }
     else
     {
-      return s;
-    }
-  }
-}
-
-
-std::string OrthancPeers::GetPeerUrl(const std::string& name) const
-{
-  return GetPeerUrl(GetPeerIndex(name));
-}
-
+      std::string tmp(id);
+      tmp.assign(id);
+      OrthancPluginFreeString(GetGlobalContext(), id);
 
-bool OrthancPeers::LookupUserProperty(std::string& value,
-                                      size_t index,
-                                      const std::string& key) const
-{
-  if (index >= index_.size())
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
-  }
-  else
-  {
-    const char* s = OrthancPluginGetPeerUserProperty(GetGlobalContext(), peers_, static_cast<uint32_t>(index), key.c_str());
-    if (s == NULL)
-    {
-      return false;
-    }
-    else
-    {
-      value.assign(s);
-      return true;
+      return tmp;
     }
   }
-}
-
-
-bool OrthancPeers::LookupUserProperty(std::string& value,
-                                      const std::string& peer,
-                                      const std::string& key) const
-{
-  return LookupUserProperty(value, GetPeerIndex(peer), key);
-}
-
-
-bool OrthancPeers::DoGet(MemoryBuffer& target,
-                         size_t index,
-                         const std::string& uri) const
-{
-  if (index >= index_.size())
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
-  }
-
-  OrthancPluginMemoryBuffer answer;
-  uint16_t status;
-  OrthancPluginErrorCode code = OrthancPluginCallPeerApi
-      (GetGlobalContext(), &answer, NULL, &status, peers_,
-       static_cast<uint32_t>(index), OrthancPluginHttpMethod_Get, uri.c_str(),
-       0, NULL, NULL, NULL, 0, timeout_);
-
-  if (code == OrthancPluginErrorCode_Success)
-  {
-    target.Assign(answer);
-    return (status == 200);
-  }
-  else
-  {
-    return false;
-  }
-}
-
-
-bool OrthancPeers::DoGet(MemoryBuffer& target,
-                         const std::string& name,
-                         const std::string& uri) const
-{
-  size_t index;
-  return (LookupName(index, name) &&
-          DoGet(target, index, uri));
-}
-
-
-bool OrthancPeers::DoGet(Json::Value& target,
-                         size_t index,
-                         const std::string& uri) const
-{
-  MemoryBuffer buffer;
-
-  if (DoGet(buffer, index, uri))
-  {
-    buffer.ToJson(target);
-    return true;
-  }
-  else
-  {
-    return false;
-  }
-}
-
-
-bool OrthancPeers::DoGet(Json::Value& target,
-                         const std::string& name,
-                         const std::string& uri) const
-{
-  MemoryBuffer buffer;
-
-  if (DoGet(buffer, name, uri))
-  {
-    buffer.ToJson(target);
-    return true;
-  }
-  else
-  {
-    return false;
-  }
-}
-
-
-bool OrthancPeers::DoPost(MemoryBuffer& target,
-                          const std::string& name,
-                          const std::string& uri,
-                          const std::string& body) const
-{
-  size_t index;
-  return (LookupName(index, name) &&
-          DoPost(target, index, uri, body));
-}
-
-
-bool OrthancPeers::DoPost(Json::Value& target,
-                          size_t index,
-                          const std::string& uri,
-                          const std::string& body) const
-{
-  MemoryBuffer buffer;
-
-  if (DoPost(buffer, index, uri, body))
-  {
-    buffer.ToJson(target);
-    return true;
-  }
-  else
-  {
-    return false;
-  }
-}
-
-
-bool OrthancPeers::DoPost(Json::Value& target,
-                          const std::string& name,
-                          const std::string& uri,
-                          const std::string& body) const
-{
-  MemoryBuffer buffer;
-
-  if (DoPost(buffer, name, uri, body))
-  {
-    buffer.ToJson(target);
-    return true;
-  }
-  else
-  {
-    return false;
-  }
-}
-
-
-bool OrthancPeers::DoPost(MemoryBuffer& target,
-                          size_t index,
-                          const std::string& uri,
-                          const std::string& body) const
-{
-  if (index >= index_.size())
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
-  }
-
-  OrthancPluginMemoryBuffer answer;
-  uint16_t status;
-  OrthancPluginErrorCode code = OrthancPluginCallPeerApi
-      (GetGlobalContext(), &answer, NULL, &status, peers_,
-       static_cast<uint32_t>(index), OrthancPluginHttpMethod_Post, uri.c_str(),
-       0, NULL, NULL, body.empty() ? NULL : body.c_str(), body.size(), timeout_);
-
-  if (code == OrthancPluginErrorCode_Success)
-  {
-    target.Assign(answer);
-    return (status == 200);
-  }
-  else
-  {
-    return false;
-  }
-}
-
-
-bool OrthancPeers::DoPut(size_t index,
-                         const std::string& uri,
-                         const std::string& body) const
-{
-  if (index >= index_.size())
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
-  }
-
-  OrthancPluginMemoryBuffer answer;
-  uint16_t status;
-  OrthancPluginErrorCode code = OrthancPluginCallPeerApi
-      (GetGlobalContext(), &answer, NULL, &status, peers_,
-       static_cast<uint32_t>(index), OrthancPluginHttpMethod_Put, uri.c_str(),
-       0, NULL, NULL, body.empty() ? NULL : body.c_str(), body.size(), timeout_);
-
-  if (code == OrthancPluginErrorCode_Success)
-  {
-    OrthancPluginFreeMemoryBuffer(GetGlobalContext(), &answer);
-    return (status == 200);
-  }
-  else
-  {
-    return false;
-  }
-}
-
-
-bool OrthancPeers::DoPut(const std::string& name,
-                         const std::string& uri,
-                         const std::string& body) const
-{
-  size_t index;
-  return (LookupName(index, name) &&
-          DoPut(index, uri, body));
-}
-
-
-bool OrthancPeers::DoDelete(size_t index,
-                            const std::string& uri) const
-{
-  if (index >= index_.size())
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
-  }
-
-  OrthancPluginMemoryBuffer answer;
-  uint16_t status;
-  OrthancPluginErrorCode code = OrthancPluginCallPeerApi
-      (GetGlobalContext(), &answer, NULL, &status, peers_,
-       static_cast<uint32_t>(index), OrthancPluginHttpMethod_Put, uri.c_str(),
-       0, NULL, NULL, NULL, 0, timeout_);
-
-  if (code == OrthancPluginErrorCode_Success)
-  {
-    OrthancPluginFreeMemoryBuffer(GetGlobalContext(), &answer);
-    return (status == 200);
-  }
-  else
-  {
-    return false;
-  }
-}
-
-
-bool OrthancPeers::DoDelete(const std::string& name,
-                            const std::string& uri) const
-{
-  size_t index;
-  return (LookupName(index, name) &&
-          DoDelete(index, uri));
-}
-#endif
-
-
-
-#if HAS_ORTHANC_PLUGIN_JOB == 1
-void OrthancJob::CallbackFinalize(void* job)
-{
-  if (job != NULL)
-  {
-    delete reinterpret_cast<OrthancJob*>(job);
-  }
-}
-
-
-float OrthancJob::CallbackGetProgress(void* job)
-{
-  assert(job != NULL);
-
-  try
-  {
-    return reinterpret_cast<OrthancJob*>(job)->progress_;
-  }
-  catch (...)
-  {
-    return 0;
-  }
-}
-
-
-const char* OrthancJob::CallbackGetContent(void* job)
-{
-  assert(job != NULL);
-
-  try
-  {
-    return reinterpret_cast<OrthancJob*>(job)->content_.c_str();
-  }
-  catch (...)
-  {
-    return 0;
-  }
-}
-
-
-const char* OrthancJob::CallbackGetSerialized(void* job)
-{
-  assert(job != NULL);
-
-  try
-  {
-    const OrthancJob& tmp = *reinterpret_cast<OrthancJob*>(job);
-
-    if (tmp.hasSerialized_)
-    {
-      return tmp.serialized_.c_str();
-    }
-    else
-    {
-      return NULL;
-    }
-  }
-  catch (...)
-  {
-    return 0;
-  }
-}
-
-
-OrthancPluginJobStepStatus OrthancJob::CallbackStep(void* job)
-{
-  assert(job != NULL);
-
-  try
-  {
-    return reinterpret_cast<OrthancJob*>(job)->Step();
-  }
-  catch (ORTHANC_PLUGINS_EXCEPTION_CLASS&)
-  {
-    return OrthancPluginJobStepStatus_Failure;
-  }
-  catch (...)
-  {
-    return OrthancPluginJobStepStatus_Failure;
-  }
-}
-
-
-OrthancPluginErrorCode OrthancJob::CallbackStop(void* job,
-                                                OrthancPluginJobStopReason reason)
-{
-  assert(job != NULL);
-
-  try
-  {
-    reinterpret_cast<OrthancJob*>(job)->Stop(reason);
-    return OrthancPluginErrorCode_Success;
-  }
-  catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e)
-  {
-    return static_cast<OrthancPluginErrorCode>(e.GetErrorCode());
-  }
-  catch (...)
-  {
-    return OrthancPluginErrorCode_Plugin;
-  }
-}
-
-
-OrthancPluginErrorCode OrthancJob::CallbackReset(void* job)
-{
-  assert(job != NULL);
-
-  try
-  {
-    reinterpret_cast<OrthancJob*>(job)->Reset();
-    return OrthancPluginErrorCode_Success;
-  }
-  catch (ORTHANC_PLUGINS_EXCEPTION_CLASS& e)
-  {
-    return static_cast<OrthancPluginErrorCode>(e.GetErrorCode());
-  }
-  catch (...)
-  {
-    return OrthancPluginErrorCode_Plugin;
-  }
-}
-
-
-void OrthancJob::ClearContent()
-{
-  Json::Value empty = Json::objectValue;
-  UpdateContent(empty);
-}
-
-
-void OrthancJob::UpdateContent(const Json::Value& content)
-{
-  if (content.type() != Json::objectValue)
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_BadFileFormat);
-  }
-  else
-  {
-    Json::FastWriter writer;
-    content_ = writer.write(content);
-  }
-}
-
-
-void OrthancJob::ClearSerialized()
-{
-  hasSerialized_ = false;
-  serialized_.clear();
-}
-
-
-void OrthancJob::UpdateSerialized(const Json::Value& serialized)
-{
-  if (serialized.type() != Json::objectValue)
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_BadFileFormat);
-  }
-  else
-  {
-    Json::FastWriter writer;
-    serialized_ = writer.write(serialized);
-    hasSerialized_ = true;
-  }
-}
-
-
-void OrthancJob::UpdateProgress(float progress)
-{
-  if (progress < 0 ||
-      progress > 1)
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange);
-  }
-
-  progress_ = progress;
-}
-
-
-OrthancJob::OrthancJob(const std::string& jobType) :
-  jobType_(jobType),
-  progress_(0)
-{
-  ClearContent();
-  ClearSerialized();
-}
-
-
-OrthancPluginJob* OrthancJob::Create(OrthancJob* job)
-{
-  if (job == NULL)
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_NullPointer);
-  }
-
-  OrthancPluginJob* orthanc = OrthancPluginCreateJob(
-        GetGlobalContext(), job, CallbackFinalize, job->jobType_.c_str(),
-        CallbackGetProgress, CallbackGetContent, CallbackGetSerialized,
-        CallbackStep, CallbackStop, CallbackReset);
-
-  if (orthanc == NULL)
-  {
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin);
-  }
-  else
-  {
-    return orthanc;
-  }
-}
-
-
-std::string OrthancJob::Submit(OrthancJob* job,
-                               int priority)
-{
-  OrthancPluginJob* orthanc = Create(job);
-
-  char* id = OrthancPluginSubmitJob(GetGlobalContext(), orthanc, priority);
-
-  if (id == NULL)
-  {
-    LogError("Plugin cannot submit job");
-    OrthancPluginFreeJob(GetGlobalContext(), orthanc);
-    ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_Plugin);
-  }
-  else
-  {
-    std::string tmp(id);
-    tmp.assign(id);
-    OrthancPluginFreeString(GetGlobalContext(), id);
-
-    return tmp;
-  }
-}
 #endif
 }