Mercurial > hg > orthanc
annotate OrthancServer/ServerJobs/SystemCallOperation.cpp @ 2618:ef5b45884972 jobs
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 22 May 2018 12:59:38 +0200 |
| parents | 2f3007bf0708 |
| children |
| 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 | |
| 5 * Copyright (C) 2017-2018 Osimis S.A., Belgium | |
| 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 | |
| 34 #include "../PrecompiledHeadersServer.h" | |
| 35 #include "SystemCallOperation.h" | |
| 36 | |
| 37 #include "DicomInstanceOperationValue.h" | |
| 38 | |
| 39 #include "../../Core/JobsEngine/Operations/StringOperationValue.h" | |
| 40 #include "../../Core/Logging.h" | |
| 41 #include "../../Core/TemporaryFile.h" | |
| 42 #include "../../Core/Toolbox.h" | |
| 43 | |
| 44 namespace Orthanc | |
| 45 { | |
| 46 void SystemCallOperation::Apply(JobOperationValues& outputs, | |
|
2608
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2607
diff
changeset
|
47 const JobOperationValue& input, |
|
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2607
diff
changeset
|
48 IDicomConnectionManager& connectionManager) |
| 2606 | 49 { |
| 50 std::vector<std::string> arguments = preArguments_; | |
| 51 | |
| 52 arguments.reserve(arguments.size() + postArguments_.size() + 1); | |
| 53 | |
| 54 std::auto_ptr<TemporaryFile> tmp; | |
| 55 | |
| 56 switch (input.GetType()) | |
| 57 { | |
| 58 case JobOperationValue::Type_DicomInstance: | |
| 59 { | |
| 60 const DicomInstanceOperationValue& instance = | |
| 61 dynamic_cast<const DicomInstanceOperationValue&>(input); | |
| 62 | |
| 63 std::string dicom; | |
| 64 instance.ReadContent(dicom); | |
| 65 | |
| 66 tmp.reset(new TemporaryFile); | |
| 67 tmp->Write(dicom); | |
| 68 | |
| 69 arguments.push_back(tmp->GetPath()); | |
| 70 break; | |
| 71 } | |
| 72 | |
| 73 case JobOperationValue::Type_String: | |
| 74 { | |
| 75 const StringOperationValue& value = | |
| 76 dynamic_cast<const StringOperationValue&>(input); | |
| 77 | |
| 78 arguments.push_back(value.GetContent()); | |
| 79 break; | |
| 80 } | |
| 81 | |
| 82 case JobOperationValue::Type_Null: | |
| 83 break; | |
| 84 | |
| 85 default: | |
| 86 throw OrthancException(ErrorCode_BadParameterType); | |
| 87 } | |
| 88 | |
| 89 for (size_t i = 0; i < postArguments_.size(); i++) | |
| 90 { | |
| 91 arguments.push_back(postArguments_[i]); | |
| 92 } | |
| 93 | |
| 94 std::string info = command_; | |
| 95 for (size_t i = 0; i < arguments.size(); i++) | |
| 96 { | |
| 97 info += " " + arguments[i]; | |
| 98 } | |
| 99 | |
|
2607
44e268605478
ModifyInstanceOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
100 LOG(INFO) << "Lua: System call: \"" << info << "\""; |
| 2606 | 101 |
| 102 try | |
| 103 { | |
| 104 SystemToolbox::ExecuteSystemCommand(command_, arguments); | |
| 105 | |
| 106 // Only chain with other commands if this operation succeeds | |
| 107 outputs.Append(input.Clone()); | |
| 108 } | |
| 109 catch (OrthancException& e) | |
| 110 { | |
|
2607
44e268605478
ModifyInstanceOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
111 LOG(ERROR) << "Lua: Failed system call - \"" << info << "\": " << e.What(); |
| 2606 | 112 } |
| 113 } | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
114 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
115 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
116 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
|
117 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
118 result["Type"] = "SystemCall"; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
119 result["Command"] = command_; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
120 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
121 Json::Value tmp; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
122 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
123 tmp = Json::arrayValue; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
124 for (size_t i = 0; i < preArguments_.size(); i++) |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
125 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
126 tmp.append(preArguments_[i]); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
127 } |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
128 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
129 result["PreArguments"] = tmp; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
130 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
131 tmp = Json::arrayValue; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
132 for (size_t i = 0; i < postArguments_.size(); i++) |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
133 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
134 tmp.append(postArguments_[i]); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
135 } |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
136 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
137 result["PostArguments"] = tmp; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
138 } |
| 2606 | 139 } |
| 140 |