Mercurial > hg > orthanc

changeset 2605:1e11b0229e04 jobs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
StorePeerOperation
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 18 May 2018 18:06:53 +0200
parents 76ef12fa136c
children f2b9d3256060
files CMakeLists.txt OrthancServer/ServerJobs/DeleteResourceOperation.cpp OrthancServer/ServerJobs/LuaJobManager.cpp OrthancServer/ServerJobs/LuaJobManager.h OrthancServer/ServerJobs/StorePeerOperation.cpp OrthancServer/ServerJobs/StorePeerOperation.h OrthancServer/ServerJobs/StoreScuOperation.cpp
diffstat 7 files changed, 155 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Fri May 18 17:37:14 2018 +0200
+++ b/CMakeLists.txt	Fri May 18 18:06:53 2018 +0200
@@ -94,6 +94,7 @@
   OrthancServer/ServerJobs/DicomModalityStoreJob.cpp
   OrthancServer/ServerJobs/LuaJobManager.cpp
   OrthancServer/ServerJobs/OrthancPeerStoreJob.cpp
+  OrthancServer/ServerJobs/StorePeerOperation.cpp
   OrthancServer/ServerJobs/StoreScuOperation.cpp
   OrthancServer/ServerToolbox.cpp
   OrthancServer/SliceOrdering.cpp
--- a/OrthancServer/ServerJobs/DeleteResourceOperation.cpp	Fri May 18 17:37:14 2018 +0200
+++ b/OrthancServer/ServerJobs/DeleteResourceOperation.cpp	Fri May 18 18:06:53 2018 +0200
@@ -49,7 +49,7 @@
       case JobOperationValue::Type_DicomInstance:
       {
         const DicomInstanceOperationValue& instance = dynamic_cast<const DicomInstanceOperationValue&>(input);
-        LOG(INFO) << "Deleting instance: " << instance.GetId();
+        LOG(INFO) << "Lua: Deleting instance: " << instance.GetId();
 
         try
         {
@@ -58,7 +58,7 @@
         }
         catch (OrthancException& e)
         {
-          LOG(ERROR) << "Unable to delete instance " << instance.GetId() << ": " << e.What();
+          LOG(ERROR) << "Lua: Unable to delete instance " << instance.GetId() << ": " << e.What();
         }
 
         break;
--- a/OrthancServer/ServerJobs/LuaJobManager.cpp	Fri May 18 17:37:14 2018 +0200
+++ b/OrthancServer/ServerJobs/LuaJobManager.cpp	Fri May 18 18:06:53 2018 +0200
@@ -35,6 +35,7 @@
 #include "LuaJobManager.h"
 
 #include "DeleteResourceOperation.h"
+#include "StorePeerOperation.h"
 #include "StoreScuOperation.h"
 #include "../../Core/JobsEngine/Operations/LogJobOperation.h"
 
@@ -174,14 +175,20 @@
 
 
   size_t LuaJobManager::Lock::AddStoreScuOperation(const std::string& localAet,
-                                                   const RemoteModalityParameters& modality,
-                                                   IDicomConnectionManager& manager)
+                                                   const RemoteModalityParameters& modality)
   {
     assert(jobLock_.get() != NULL);
     return jobLock_->AddOperation(new StoreScuOperation(localAet, modality, that_.connectionManager_));    
   }
 
 
+  size_t LuaJobManager::Lock::AddStorePeerOperation(const WebServiceParameters& peer)
+  {
+    assert(jobLock_.get() != NULL);
+    return jobLock_->AddOperation(new StorePeerOperation(peer));    
+  }
+
+
   void LuaJobManager::Lock::AddNullInput(size_t operation)
   {
     assert(jobLock_.get() != NULL);
--- a/OrthancServer/ServerJobs/LuaJobManager.h	Fri May 18 17:37:14 2018 +0200
+++ b/OrthancServer/ServerJobs/LuaJobManager.h	Fri May 18 18:06:53 2018 +0200
@@ -89,8 +89,9 @@
       size_t AddDeleteResourceOperation(ServerContext& context);
 
       size_t AddStoreScuOperation(const std::string& localAet,
-                                  const RemoteModalityParameters& modality,
-                                  IDicomConnectionManager& manager);
+                                  const RemoteModalityParameters& modality);
+
+      size_t AddStorePeerOperation(const WebServiceParameters& peer);
 
       void AddNullInput(size_t operation); 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancServer/ServerJobs/StorePeerOperation.cpp	Fri May 18 18:06:53 2018 +0200
@@ -0,0 +1,81 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * In addition, as a special exception, the copyright holders of this
+ * program give permission to link the code of its release with the
+ * OpenSSL project's "OpenSSL" library (or with modified versions of it
+ * that use the same license as the "OpenSSL" library), and distribute
+ * the linked executables. You must obey the GNU General Public License
+ * in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s) with this exception, you may extend this exception to
+ * your version of the file(s), but you are not obligated to do so. If
+ * you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files
+ * in the program, then also delete it here.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#include "../PrecompiledHeadersServer.h"
+#include "StorePeerOperation.h"
+
+#include "DicomInstanceOperationValue.h"
+
+#include "../../Core/Logging.h"
+#include "../../Core/OrthancException.h"
+#include "../../Core/HttpClient.h"
+
+namespace Orthanc
+{
+  void StorePeerOperation::Apply(JobOperationValues& outputs,
+                                const JobOperationValue& input)
+  {
+    // Configure the HTTP client
+    HttpClient client(peer_, "instances");
+    client.SetMethod(HttpMethod_Post);
+
+    if (input.GetType() != JobOperationValue::Type_DicomInstance)
+    {
+      throw OrthancException(ErrorCode_BadParameterType);
+    }
+
+    const DicomInstanceOperationValue& instance = dynamic_cast<const DicomInstanceOperationValue&>(input);
+
+    LOG(INFO) << "Lua: Sending instance " << instance.GetId() << " to Orthanc peer \"" 
+              << peer_.GetUrl() << "\"";
+
+    try
+    {
+      instance.ReadContent(client.GetBody());
+
+      std::string answer;
+      if (!client.Apply(answer))
+      {
+        LOG(ERROR) << "Lua: Unable to send instance " << instance.GetId() << " to Orthanc peer \"" 
+                   << peer_.GetUrl();
+      }
+
+      outputs.Append(instance.Clone());
+    }
+    catch (OrthancException& e)
+    {
+      LOG(ERROR) << "Lua: Unable to send instance " << instance.GetId() << " to Orthanc peer \"" 
+                 << peer_.GetUrl() << "\": " << e.What();
+    }
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancServer/ServerJobs/StorePeerOperation.h	Fri May 18 18:06:53 2018 +0200
@@ -0,0 +1,56 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * In addition, as a special exception, the copyright holders of this
+ * program give permission to link the code of its release with the
+ * OpenSSL project's "OpenSSL" library (or with modified versions of it
+ * that use the same license as the "OpenSSL" library), and distribute
+ * the linked executables. You must obey the GNU General Public License
+ * in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s) with this exception, you may extend this exception to
+ * your version of the file(s), but you are not obligated to do so. If
+ * you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files
+ * in the program, then also delete it here.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#pragma once
+
+#include "../../Core/JobsEngine/Operations/IJobOperation.h"
+#include "../../Core/WebServiceParameters.h"
+
+namespace Orthanc
+{
+  class StorePeerOperation : public IJobOperation
+  {
+  private:
+    WebServiceParameters peer_;
+
+  public:
+    StorePeerOperation(const WebServiceParameters& peer) :
+    peer_(peer)
+    {
+    }
+
+    virtual void Apply(JobOperationValues& outputs,
+                       const JobOperationValue& input);
+  };
+}
+
--- a/OrthancServer/ServerJobs/StoreScuOperation.cpp	Fri May 18 17:37:14 2018 +0200
+++ b/OrthancServer/ServerJobs/StoreScuOperation.cpp	Fri May 18 18:06:53 2018 +0200
@@ -49,7 +49,7 @@
 
     if (resource.get() == NULL)
     {
-      LOG(ERROR) << "Cannot connect to modality: " << modality_.GetApplicationEntityTitle();
+      LOG(ERROR) << "Lua: Cannot connect to modality: " << modality_.GetApplicationEntityTitle();
       return;
     }
 
@@ -60,7 +60,7 @@
 
     const DicomInstanceOperationValue& instance = dynamic_cast<const DicomInstanceOperationValue&>(input);
 
-    LOG(INFO) << "Sending instance " << instance.GetId() << " to modality \"" 
+    LOG(INFO) << "Lua: Sending instance " << instance.GetId() << " to modality \"" 
               << modality_.GetApplicationEntityTitle() << "\"";
 
     try
@@ -72,7 +72,7 @@
     }
     catch (OrthancException& e)
     {
-      LOG(ERROR) << "Unable to send instance " << instance.GetId() << " to modality \"" 
+      LOG(ERROR) << "Lua: Unable to send instance " << instance.GetId() << " to modality \"" 
                  << modality_.GetApplicationEntityTitle() << "\": " << e.What();
     }
   }