Mercurial > hg > orthanc
annotate OrthancServer/ServerJobs/Operations/SystemCallOperation.cpp @ 3154:6e8822be2f08
Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive)
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 21 Jan 2019 12:09:04 +0100 |
| parents | beeeb6096f27 |
| children | 6fd38327e777 |
| rev | line source |
|---|---|
| 2606 | 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:
2659
diff
changeset
|
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
| 2606 | 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" |
| 2606 | 35 #include "SystemCallOperation.h" |
| 36 | |
| 37 #include "DicomInstanceOperationValue.h" | |
| 38 | |
| 2641 | 39 #include "../../../Core/JobsEngine/Operations/StringOperationValue.h" |
| 40 #include "../../../Core/Logging.h" | |
| 2659 | 41 #include "../../../Core/OrthancException.h" |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
42 #include "../../../Core/SerializationToolbox.h" |
| 2641 | 43 #include "../../../Core/TemporaryFile.h" |
| 44 #include "../../../Core/Toolbox.h" | |
|
3095
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
45 #include "../../../Core/SystemToolbox.h" |
| 2606 | 46 |
| 47 namespace Orthanc | |
| 48 { | |
| 2659 | 49 const std::string& SystemCallOperation::GetPreArgument(size_t i) const |
| 50 { | |
| 51 if (i >= preArguments_.size()) | |
| 52 { | |
| 53 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 54 } | |
| 55 else | |
| 56 { | |
| 57 return preArguments_[i]; | |
| 58 } | |
| 59 } | |
| 60 | |
| 61 | |
| 62 const std::string& SystemCallOperation::GetPostArgument(size_t i) const | |
| 63 { | |
| 64 if (i >= postArguments_.size()) | |
| 65 { | |
| 66 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 67 } | |
| 68 else | |
| 69 { | |
| 70 return postArguments_[i]; | |
| 71 } | |
| 72 } | |
| 73 | |
| 74 | |
| 2606 | 75 void SystemCallOperation::Apply(JobOperationValues& outputs, |
|
2608
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2607
diff
changeset
|
76 const JobOperationValue& input, |
|
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2607
diff
changeset
|
77 IDicomConnectionManager& connectionManager) |
| 2606 | 78 { |
| 79 std::vector<std::string> arguments = preArguments_; | |
| 80 | |
| 81 arguments.reserve(arguments.size() + postArguments_.size() + 1); | |
| 82 | |
| 83 std::auto_ptr<TemporaryFile> tmp; | |
| 84 | |
| 85 switch (input.GetType()) | |
| 86 { | |
| 87 case JobOperationValue::Type_DicomInstance: | |
| 88 { | |
| 89 const DicomInstanceOperationValue& instance = | |
| 90 dynamic_cast<const DicomInstanceOperationValue&>(input); | |
| 91 | |
| 92 std::string dicom; | |
|
2651
1da5a052c777
testing value serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2641
diff
changeset
|
93 instance.ReadDicom(dicom); |
| 2606 | 94 |
| 95 tmp.reset(new TemporaryFile); | |
| 96 tmp->Write(dicom); | |
| 97 | |
| 98 arguments.push_back(tmp->GetPath()); | |
| 99 break; | |
| 100 } | |
| 101 | |
| 102 case JobOperationValue::Type_String: | |
| 103 { | |
| 104 const StringOperationValue& value = | |
| 105 dynamic_cast<const StringOperationValue&>(input); | |
| 106 | |
| 107 arguments.push_back(value.GetContent()); | |
| 108 break; | |
| 109 } | |
| 110 | |
| 111 case JobOperationValue::Type_Null: | |
| 112 break; | |
| 113 | |
| 114 default: | |
| 115 throw OrthancException(ErrorCode_BadParameterType); | |
| 116 } | |
| 117 | |
| 118 for (size_t i = 0; i < postArguments_.size(); i++) | |
| 119 { | |
| 120 arguments.push_back(postArguments_[i]); | |
| 121 } | |
| 122 | |
| 123 std::string info = command_; | |
| 124 for (size_t i = 0; i < arguments.size(); i++) | |
| 125 { | |
| 126 info += " " + arguments[i]; | |
| 127 } | |
| 128 | |
|
2607
44e268605478
ModifyInstanceOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
129 LOG(INFO) << "Lua: System call: \"" << info << "\""; |
| 2606 | 130 |
| 131 try | |
| 132 { | |
| 133 SystemToolbox::ExecuteSystemCommand(command_, arguments); | |
| 134 | |
| 135 // Only chain with other commands if this operation succeeds | |
| 136 outputs.Append(input.Clone()); | |
| 137 } | |
| 138 catch (OrthancException& e) | |
| 139 { | |
|
2607
44e268605478
ModifyInstanceOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
140 LOG(ERROR) << "Lua: Failed system call - \"" << info << "\": " << e.What(); |
| 2606 | 141 } |
| 142 } | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
143 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
144 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
145 void SystemCallOperation::Serialize(Json::Value& result) const |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
146 { |
| 2654 | 147 result = Json::objectValue; |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
148 result["Type"] = "SystemCall"; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
149 result["Command"] = command_; |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
150 SerializationToolbox::WriteArrayOfStrings(result, preArguments_, "PreArguments"); |
|
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
151 SerializationToolbox::WriteArrayOfStrings(result, postArguments_, "PostArguments"); |
| 2655 | 152 } |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
153 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
154 |
| 2655 | 155 SystemCallOperation::SystemCallOperation(const Json::Value& serialized) |
| 156 { | |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
157 if (SerializationToolbox::ReadString(serialized, "Type") != "SystemCall") |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
158 { |
| 2655 | 159 throw OrthancException(ErrorCode_BadFileFormat); |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
160 } |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
161 |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
162 command_ = SerializationToolbox::ReadString(serialized, "Command"); |
|
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
163 SerializationToolbox::ReadArrayOfStrings(preArguments_, serialized, "PreArguments"); |
|
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
164 SerializationToolbox::ReadArrayOfStrings(postArguments_, serialized, "PostArguments"); |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
165 } |
| 2606 | 166 } |