Mercurial > hg > orthanc
annotate OrthancServer/ServerJobs/Operations/StorePeerOperation.cpp @ 3388:18cd4951fccc
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 06 Jun 2019 09:04:26 +0200 |
| parents | 4e43e67f8ecf |
| children | 94f4a18a79cc |
| rev | line source |
|---|---|
| 2605 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
3060
4e43e67f8ecf
preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2800
diff
changeset
|
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
| 2605 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 11 * | |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 23 * | |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
| 2641 | 34 #include "../../PrecompiledHeadersServer.h" |
| 2605 | 35 #include "StorePeerOperation.h" |
| 36 | |
| 37 #include "DicomInstanceOperationValue.h" | |
| 38 | |
| 2641 | 39 #include "../../../Core/Logging.h" |
| 40 #include "../../../Core/OrthancException.h" | |
| 41 #include "../../../Core/HttpClient.h" | |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
42 #include "../../../Core/SerializationToolbox.h" |
| 2605 | 43 |
| 44 namespace Orthanc | |
| 45 { | |
| 46 void StorePeerOperation::Apply(JobOperationValues& outputs, | |
|
2657
5eea2f11e8df
JobsSerialization.GenericJobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2656
diff
changeset
|
47 const JobOperationValue& input, |
|
2608
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
48 IDicomConnectionManager& connectionManager) |
| 2605 | 49 { |
| 50 // Configure the HTTP client | |
| 51 HttpClient client(peer_, "instances"); | |
| 52 client.SetMethod(HttpMethod_Post); | |
| 53 | |
| 54 if (input.GetType() != JobOperationValue::Type_DicomInstance) | |
| 55 { | |
| 56 throw OrthancException(ErrorCode_BadParameterType); | |
| 57 } | |
| 58 | |
|
2608
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
59 const DicomInstanceOperationValue& instance = |
|
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
60 dynamic_cast<const DicomInstanceOperationValue&>(input); |
| 2605 | 61 |
| 62 LOG(INFO) << "Lua: Sending instance " << instance.GetId() << " to Orthanc peer \"" | |
| 63 << peer_.GetUrl() << "\""; | |
| 64 | |
| 65 try | |
| 66 { | |
|
2651
1da5a052c777
testing value serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2641
diff
changeset
|
67 instance.ReadDicom(client.GetBody()); |
| 2605 | 68 |
| 69 std::string answer; | |
| 70 if (!client.Apply(answer)) | |
| 71 { | |
|
2608
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
72 LOG(ERROR) << "Lua: Unable to send instance " << instance.GetId() |
|
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
73 << " to Orthanc peer \"" << peer_.GetUrl(); |
| 2605 | 74 } |
| 75 } | |
| 76 catch (OrthancException& e) | |
| 77 { | |
|
2608
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
78 LOG(ERROR) << "Lua: Unable to send instance " << instance.GetId() |
|
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
79 << " to Orthanc peer \"" << peer_.GetUrl() << "\": " << e.What(); |
| 2605 | 80 } |
|
2609
f7a84b551ee4
switch Lua to new jobs engine
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
81 |
|
f7a84b551ee4
switch Lua to new jobs engine
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
82 outputs.Append(input.Clone()); |
| 2605 | 83 } |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
84 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
85 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
86 void StorePeerOperation::Serialize(Json::Value& result) const |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
87 { |
| 2654 | 88 result = Json::objectValue; |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
89 result["Type"] = "StorePeer"; |
|
2800
dc7330089736
"OrthancPeers" configuration option now allows to specify HTTP headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2657
diff
changeset
|
90 peer_.Serialize(result["Peer"], |
|
dc7330089736
"OrthancPeers" configuration option now allows to specify HTTP headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2657
diff
changeset
|
91 true /* force advanced format */, |
|
dc7330089736
"OrthancPeers" configuration option now allows to specify HTTP headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2657
diff
changeset
|
92 true /* include passwords */); |
| 2655 | 93 } |
| 94 | |
| 95 | |
| 96 StorePeerOperation::StorePeerOperation(const Json::Value& serialized) | |
| 97 { | |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
98 if (SerializationToolbox::ReadString(serialized, "Type") != "StorePeer" || |
| 2655 | 99 !serialized.isMember("Peer")) |
| 100 { | |
| 101 throw OrthancException(ErrorCode_BadFileFormat); | |
| 102 } | |
| 103 | |
| 104 peer_ = WebServiceParameters(serialized["Peer"]); | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2609
diff
changeset
|
105 } |
| 2605 | 106 } |