orthanc: OrthancServer/Sources/LuaScripting.cpp annotate

annotate OrthancServer/Sources/LuaScripting.cpp @ 4605:c8f444e8556d

new function in the plugin SDK: OrthancPluginCallRestApi()

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 30 Mar 2021 16:34:02 +0200
parents	b4c58795f3a8
children	d01702fb29a9

rev	line source
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1698 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
4437 d9473bd5ed43 upgrade to year 2021 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4329 diff changeset	5 * Copyright (C) 2017-2021 Osimis S.A., Belgium
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "PrecompiledHeadersServer.h"
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "LuaScripting.h"
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	37 #include "OrthancConfiguration.h"
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	38 #include "OrthancRestApi/OrthancRestApi.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 #include "ServerContext.h"
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	40
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	41 #include "../../OrthancFramework/Sources/HttpServer/StringHttpOutput.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	42 #include "../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	43 #include "../../OrthancFramework/Sources/Lua/LuaFunctionCall.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4031 diff changeset	45 #include <OrthancServerResources.h>
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 namespace Orthanc
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	50 class LuaScripting::IEvent : public IDynamicObject
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	51 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	52 public:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	53 virtual void Apply(LuaScripting& lock) = 0;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	54 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	55
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	56
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	57 class LuaScripting::OnStoredInstanceEvent : public LuaScripting::IEvent
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	58 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	59 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	60 std::string instanceId_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	61 Json::Value simplifiedTags_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	62 Json::Value metadata_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	63 Json::Value origin_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	64
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	65 public:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	66 OnStoredInstanceEvent(const std::string& instanceId,
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	67 const Json::Value& simplifiedTags,
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	68 const Json::Value& metadata,
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	69 const DicomInstanceToStore& instance) :
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	70 instanceId_(instanceId),
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	71 simplifiedTags_(simplifiedTags),
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	72 metadata_(metadata)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	73 {
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2638 diff changeset	74 instance.GetOrigin().Format(origin_);
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	75 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	76
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	77 virtual void Apply(LuaScripting& that) ORTHANC_OVERRIDE
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	78 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	79 static const char* NAME = "OnStoredInstance";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	80
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	81 LuaScripting::Lock lock(that);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	82
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	83 if (lock.GetLua().IsExistingFunction(NAME))
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 that.InitializeJob();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	86
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	87 LuaFunctionCall call(lock.GetLua(), NAME);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	88 call.PushString(instanceId_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	89 call.PushJson(simplifiedTags_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	90 call.PushJson(metadata_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	91 call.PushJson(origin_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	92 call.Execute();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	93
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	94 that.SubmitJob();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	95 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	96 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	97 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	98
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	99
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	100 class LuaScripting::ExecuteEvent : public LuaScripting::IEvent
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	101 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	102 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	103 std::string command_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	104
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	105 public:
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	106 explicit ExecuteEvent(const std::string& command) :
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	107 command_(command)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	108 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	109 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	110
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	111 virtual void Apply(LuaScripting& that) ORTHANC_OVERRIDE
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	112 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	113 LuaScripting::Lock lock(that);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	114
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	115 if (lock.GetLua().IsExistingFunction(command_.c_str()))
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	116 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	117 LuaFunctionCall call(lock.GetLua(), command_.c_str());
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	118 call.Execute();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	119 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	120 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	121 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	122
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	123
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	124 class LuaScripting::StableResourceEvent : public LuaScripting::IEvent
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	125 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	126 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	127 ServerIndexChange change_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	128
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	129 public:
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	130 explicit StableResourceEvent(const ServerIndexChange& change) :
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	131 change_(change)
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	132 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	133 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	134
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	135 virtual void Apply(LuaScripting& that) ORTHANC_OVERRIDE
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	136 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	137 const char* name;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	138
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	139 switch (change_.GetChangeType())
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	140 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	141 case ChangeType_StablePatient:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	142 name = "OnStablePatient";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	143 break;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	144
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	145 case ChangeType_StableStudy:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	146 name = "OnStableStudy";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	147 break;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	148
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	149 case ChangeType_StableSeries:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	150 name = "OnStableSeries";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	151 break;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	152
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	153 default:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	154 throw OrthancException(ErrorCode_InternalError);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	155 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	156
2638 25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	157 {
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	158 // Avoid unnecessary calls to the database if there's no Lua callback
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	159 LuaScripting::Lock lock(that);
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	160
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	161 if (!lock.GetLua().IsExistingFunction(name))
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	162 {
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	163 return;
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	164 }
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	165 }
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	166
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	167 Json::Value tags;
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	168
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	169 if (that.context_.GetIndex().LookupResource(tags, change_.GetPublicId(), change_.GetResourceType()))
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	170 {
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	171 std::map<MetadataType, std::string> metadata;
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	172 that.context_.GetIndex().GetAllMetadata(metadata, change_.GetPublicId(), change_.GetResourceType());
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	173
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	174 Json::Value formattedMetadata = Json::objectValue;
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	175
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	176 for (std::map<MetadataType, std::string>::const_iterator
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	177 it = metadata.begin(); it != metadata.end(); ++it)
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	178 {
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	179 std::string key = EnumerationToString(it->first);
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	180 formattedMetadata[key] = it->second;
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	181 }
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	182
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	183 {
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	184 LuaScripting::Lock lock(that);
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	185
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	186 if (lock.GetLua().IsExistingFunction(name))
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	187 {
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	188 that.InitializeJob();
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	189
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	190 LuaFunctionCall call(lock.GetLua(), name);
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	191 call.PushString(change_.GetPublicId());
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	192 call.PushJson(tags["MainDicomTags"]);
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	193 call.PushJson(formattedMetadata);
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	194 call.Execute();
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	195
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	196 that.SubmitJob();
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	197 }
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	198 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	199 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	200 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	201 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	202
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	203
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	204 class LuaScripting::JobEvent : public LuaScripting::IEvent
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	205 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	206 public:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	207 enum Type
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	208 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	209 Type_Failure,
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	210 Type_Submitted,
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	211 Type_Success
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	212 };
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	213
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	214 private:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	215 Type type_;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	216 std::string jobId_;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	217
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	218 public:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	219 JobEvent(Type type,
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	220 const std::string& jobId) :
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	221 type_(type),
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	222 jobId_(jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	223 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	224 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	225
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	226 virtual void Apply(LuaScripting& that) ORTHANC_OVERRIDE
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	227 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	228 std::string functionName;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	229
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	230 switch (type_)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	231 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	232 case Type_Failure:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	233 functionName = "OnJobFailure";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	234 break;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	235
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	236 case Type_Submitted:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	237 functionName = "OnJobSubmitted";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	238 break;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	239
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	240 case Type_Success:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	241 functionName = "OnJobSuccess";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	242 break;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	243
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	244 default:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	245 throw OrthancException(ErrorCode_InternalError);
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	246 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	247
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	248 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	249 LuaScripting::Lock lock(that);
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	250
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	251 if (lock.GetLua().IsExistingFunction(functionName.c_str()))
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	252 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	253 LuaFunctionCall call(lock.GetLua(), functionName.c_str());
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	254 call.PushString(jobId_);
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	255 call.Execute();
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	256 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	257 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	258 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	259 };
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	260
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	261
3676 231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	262 class LuaScripting::DeleteEvent : public LuaScripting::IEvent
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	263 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	264 private:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	265 ResourceType level_;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	266 std::string publicId_;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	267
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	268 public:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	269 DeleteEvent(ResourceType level,
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	270 const std::string& publicId) :
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	271 level_(level),
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	272 publicId_(publicId)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	273 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	274 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	275
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	276 virtual void Apply(LuaScripting& that) ORTHANC_OVERRIDE
3676 231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	277 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	278 std::string functionName;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	279
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	280 switch (level_)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	281 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	282 case ResourceType_Patient:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	283 functionName = "OnDeletedPatient";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	284 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	285
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	286 case ResourceType_Study:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	287 functionName = "OnDeletedStudy";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	288 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	289
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	290 case ResourceType_Series:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	291 functionName = "OnDeletedSeries";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	292 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	293
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	294 case ResourceType_Instance:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	295 functionName = "OnDeletedInstance";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	296 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	297
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	298 default:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	299 throw OrthancException(ErrorCode_InternalError);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	300 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	301
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	302 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	303 LuaScripting::Lock lock(that);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	304
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	305 if (lock.GetLua().IsExistingFunction(functionName.c_str()))
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	306 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	307 LuaFunctionCall call(lock.GetLua(), functionName.c_str());
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	308 call.PushString(publicId_);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	309 call.Execute();
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	310 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	311 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	312 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	313 };
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	314
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	315
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	316 class LuaScripting::UpdateEvent : public LuaScripting::IEvent
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	317 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	318 private:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	319 ResourceType level_;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	320 std::string publicId_;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	321
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	322 public:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	323 UpdateEvent(ResourceType level,
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	324 const std::string& publicId) :
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	325 level_(level),
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	326 publicId_(publicId)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	327 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	328 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	329
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	330 virtual void Apply(LuaScripting& that) ORTHANC_OVERRIDE
3676 231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	331 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	332 std::string functionName;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	333
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	334 switch (level_)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	335 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	336 case ResourceType_Patient:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	337 functionName = "OnUpdatedPatient";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	338 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	339
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	340 case ResourceType_Study:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	341 functionName = "OnUpdatedStudy";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	342 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	343
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	344 case ResourceType_Series:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	345 functionName = "OnUpdatedSeries";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	346 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	347
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	348 case ResourceType_Instance:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	349 functionName = "OnUpdatedInstance";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	350 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	351
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	352 default:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	353 throw OrthancException(ErrorCode_InternalError);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	354 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	355
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	356 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	357 LuaScripting::Lock lock(that);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	358
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	359 if (lock.GetLua().IsExistingFunction(functionName.c_str()))
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	360 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	361 LuaFunctionCall call(lock.GetLua(), functionName.c_str());
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	362 call.PushString(publicId_);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	363 call.Execute();
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	364 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	365 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	366 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	367 };
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	368
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	369
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	370 ServerContext* LuaScripting::GetServerContext(lua_State *state)
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	371 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	372 const void* value = LuaContext::GetGlobalVariable(state, "_ServerContext");
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	373 return const_cast<ServerContext>(reinterpret_cast<const ServerContext>(value));
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	374 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	375
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	376
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	377 // Syntax in Lua: RestApiGet(uri, builtin)
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	378 int LuaScripting::RestApiGet(lua_State *state)
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	379 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	380 ServerContext* serverContext = GetServerContext(state);
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	381 if (serverContext == NULL)
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	382 {
1440 3567503c00a7 lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	383 LOG(ERROR) << "Lua: The Orthanc API is unavailable";
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	384 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	385 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	386 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	387
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	388 // Check the types of the arguments
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	389 int nArgs = lua_gettop(state);
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	390 if (nArgs < 1 \|\| nArgs > 3 \|\|
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	391 !lua_isstring(state, 1) \|\| // URI
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	392 (nArgs >= 2 && !lua_isboolean(state, 2))) // Restrict to built-in API?
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	393 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	394 LOG(ERROR) << "Lua: Bad parameters to RestApiGet()";
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	395 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	396 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	397 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	398
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	399 const char* uri = lua_tostring(state, 1);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	400 bool builtin = (nArgs == 2 ? lua_toboolean(state, 2) != 0 : false);
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	401
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	402 std::map<std::string, std::string> headers;
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	403 LuaContext::GetDictionaryArgument(headers, state, 3, true /* HTTP header key to lower case */);
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	404
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	405 try
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	406 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	407 std::string result;
4605 c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	408 if (IHttpHandler::SimpleGet(result, NULL, serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	409 RequestOrigin_Lua, uri, headers) == HttpStatus_200_Ok)
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	410 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	411 lua_pushlstring(state, result.c_str(), result.size());
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	412 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	413 }
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	414 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	415 catch (OrthancException& e)
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	416 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	417 LOG(ERROR) << "Lua: " << e.What();
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	418 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	419
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	420 LOG(ERROR) << "Lua: Error in RestApiGet() for URI: " << uri;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	421 lua_pushnil(state);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	422 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	423 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	424
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	425
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	426 int LuaScripting::RestApiPostOrPut(lua_State *state,
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	427 bool isPost)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	428 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	429 ServerContext* serverContext = GetServerContext(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	430 if (serverContext == NULL)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	431 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	432 LOG(ERROR) << "Lua: The Orthanc API is unavailable";
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	433 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	434 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	435 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	436
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	437 // Check the types of the arguments
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	438 int nArgs = lua_gettop(state);
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	439 if (nArgs < 2 \|\| nArgs > 4 \|\|
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	440 !lua_isstring(state, 1) \|\| // URI
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	441 !lua_isstring(state, 2) \|\| // Body
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	442 (nArgs >= 3 && !lua_isboolean(state, 3))) // Restrict to built-in API?
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	443 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	444 LOG(ERROR) << "Lua: Bad parameters to " << (isPost ? "RestApiPost()" : "RestApiPut()");
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	445 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	446 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	447 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	448
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	449 const char* uri = lua_tostring(state, 1);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	450 size_t bodySize = 0;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	451 const char* bodyData = lua_tolstring(state, 2, &bodySize);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	452 bool builtin = (nArgs == 3 ? lua_toboolean(state, 3) != 0 : false);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	453
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	454 std::map<std::string, std::string> headers;
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	455 LuaContext::GetDictionaryArgument(headers, state, 4, true /* HTTP header key to lower case */);
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	456
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	457 try
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	458 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	459 std::string result;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	460 if (isPost ?
4605 c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	461 IHttpHandler::SimplePost(result, NULL,
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	462 serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	463 RequestOrigin_Lua, uri, bodyData, bodySize, headers) == HttpStatus_200_Ok :
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	464 IHttpHandler::SimplePut(result, NULL,
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	465 serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	466 RequestOrigin_Lua, uri, bodyData, bodySize, headers) == HttpStatus_200_Ok)
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	467 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	468 lua_pushlstring(state, result.c_str(), result.size());
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	469 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	470 }
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	471 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	472 catch (OrthancException& e)
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	473 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	474 LOG(ERROR) << "Lua: " << e.What();
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	475 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	476
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	477 LOG(ERROR) << "Lua: Error in " << (isPost ? "RestApiPost()" : "RestApiPut()") << " for URI: " << uri;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	478 lua_pushnil(state);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	479 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	480 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	481
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	482
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	483 // Syntax in Lua: RestApiPost(uri, body, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	484 int LuaScripting::RestApiPost(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	485 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	486 return RestApiPostOrPut(state, true);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	487 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	488
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	489
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	490 // Syntax in Lua: RestApiPut(uri, body, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	491 int LuaScripting::RestApiPut(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	492 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	493 return RestApiPostOrPut(state, false);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	494 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	495
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	496
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	497 // Syntax in Lua: RestApiDelete(uri, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	498 int LuaScripting::RestApiDelete(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	499 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	500 ServerContext* serverContext = GetServerContext(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	501 if (serverContext == NULL)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	502 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	503 LOG(ERROR) << "Lua: The Orthanc API is unavailable";
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	504 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	505 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	506 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	507
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	508 // Check the types of the arguments
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	509 int nArgs = lua_gettop(state);
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	510 if (nArgs < 1 \|\| nArgs > 3 \|\|
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	511 !lua_isstring(state, 1) \|\| // URI
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	512 (nArgs >= 2 && !lua_isboolean(state, 2))) // Restrict to built-in API?
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	513 {
1449 164a381abb2b NEWS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	514 LOG(ERROR) << "Lua: Bad parameters to RestApiDelete()";
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	515 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	516 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	517 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	518
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	519 const char* uri = lua_tostring(state, 1);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	520 bool builtin = (nArgs == 2 ? lua_toboolean(state, 2) != 0 : false);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	521
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	522 std::map<std::string, std::string> headers;
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	523 LuaContext::GetDictionaryArgument(headers, state, 3, true /* HTTP header key to lower case */);
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	524
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	525 try
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	526 {
4605 c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	527 if (IHttpHandler::SimpleDelete(NULL, serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	528 RequestOrigin_Lua, uri, headers) == HttpStatus_200_Ok)
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	529 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	530 lua_pushboolean(state, 1);
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	531 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	532 }
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	533 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	534 catch (OrthancException& e)
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	535 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	536 LOG(ERROR) << "Lua: " << e.What();
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	537 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	538
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	539 LOG(ERROR) << "Lua: Error in RestApiDelete() for URI: " << uri;
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	540 lua_pushnil(state);
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	541
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	542 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	543 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	544
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	545
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	546 // Syntax in Lua: GetOrthancConfiguration()
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	547 int LuaScripting::GetOrthancConfiguration(lua_State *state)
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	548 {
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	549 Json::Value configuration;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	550
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	551 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	552 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	553 configuration = lock.GetJson();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	554 }
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	555
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	556 LuaContext::GetLuaContext(state).PushJson(configuration);
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	557
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	558 return 1;
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	559 }
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	560
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	561
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	562 size_t LuaScripting::ParseOperation(LuaJobManager::Lock& lock,
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	563 const std::string& operation,
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	564 const Json::Value& parameters)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	565 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	566 if (operation == "delete")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	567 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	568 LOG(INFO) << "Lua script to delete resource " << parameters["Resource"].asString();
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	569 return lock.AddDeleteResourceOperation(context_);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	570 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	571
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	572 if (operation == "store-scu")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	573 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574 std::string localAet;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	575 if (parameters.isMember("LocalAet"))
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	576 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	577 localAet = parameters["LocalAet"].asString();
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	578 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	579 else
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	580 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	581 localAet = context_.GetDefaultLocalApplicationEntityTitle();
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	582 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	584 std::string name = parameters["Modality"].asString();
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	585 RemoteModalityParameters modality;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	586
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	587 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	588 OrthancConfiguration::ReaderLock configLock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	589 modality = configLock.GetConfiguration().GetModalityUsingSymbolicName(name);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	590 }
2222 21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	591
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	592 // This is not a C-MOVE: No need to call "StoreScuCommand::SetMoveOriginator()"
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3851 diff changeset	593 return lock.AddStoreScuOperation(context_, localAet, modality);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	596 if (operation == "store-peer")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	598 OrthancConfiguration::ReaderLock configLock;
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	599 std::string name = parameters["Peer"].asString();
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	600
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	601 WebServiceParameters peer;
2944 f395460af74d simplifying OrthancConfiguration for modalities/peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	602 if (configLock.GetConfiguration().LookupOrthancPeer(peer, name))
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	603 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	604 return lock.AddStorePeerOperation(peer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	605 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	606 else
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	607 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	608 throw OrthancException(ErrorCode_UnknownResource,
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	609 "No peer with symbolic name: " + name);
2799 6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	610 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	613 if (operation == "modify")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	614 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3676 diff changeset	615 std::unique_ptr<DicomModification> modification(new DicomModification);
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	616 modification->ParseModifyRequest(parameters);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	617
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	618 return lock.AddModifyInstanceOperation(context_, modification.release());
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	621 if (operation == "call-system")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	622 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	623 LOG(INFO) << "Lua script to call system command on " << parameters["Resource"].asString();
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	624
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	625 const Json::Value& argsIn = parameters["Arguments"];
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	626 if (argsIn.type() != Json::arrayValue)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	627 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628 throw OrthancException(ErrorCode_BadParameterType);
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	629 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	630
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	631 std::vector<std::string> args;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	632 args.reserve(argsIn.size());
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	633 for (Json::Value::ArrayIndex i = 0; i < argsIn.size(); ++i)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	634 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635 // http://jsoncpp.sourceforge.net/namespace_json.html#7d654b75c16a57007925868e38212b4e
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	636 switch (argsIn[i].type())
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	638 case Json::stringValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639 args.push_back(argsIn[i].asString());
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	641
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	642 case Json::intValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	643 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asInt()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	644 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	645
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	646 case Json::uintValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asUInt()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650 case Json::realValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	651 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asFloat()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	652 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	654 default:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 throw OrthancException(ErrorCode_BadParameterType);
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	657 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	658
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	659 std::string command = parameters["Command"].asString();
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	660 std::vector<std::string> postArgs;
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	661
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	662 return lock.AddSystemCallOperation(command, args, postArgs);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	665 throw OrthancException(ErrorCode_ParameterOutOfRange);
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	666 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	667
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	668
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	669 void LuaScripting::InitializeJob()
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	670 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	671 lua_.Execute("_InitializeJob()");
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	672 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	673
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	674
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	675 void LuaScripting::SubmitJob()
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	676 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	677 Json::Value operations;
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	678 LuaFunctionCall call2(lua_, "_AccessJob");
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	679 call2.ExecuteToJson(operations, false);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	680
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	681 if (operations.type() != Json::arrayValue)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	682 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	683 throw OrthancException(ErrorCode_InternalError);
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	684 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	685
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	686 LuaJobManager::Lock lock(jobManager_, context_.GetJobsEngine());
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	687
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	688 bool isFirst = true;
2727 815e30657dad fix warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 2675 diff changeset	689 size_t previous = 0; // Dummy initialization to avoid warning
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	690
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	691 for (Json::Value::ArrayIndex i = 0; i < operations.size(); ++i)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	692 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	693 if (operations[i].type() != Json::objectValue \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	694 !operations[i].isMember("Operation"))
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	695 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	696 throw OrthancException(ErrorCode_InternalError);
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	697 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	698
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	699 const Json::Value& parameters = operations[i];
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	700 if (!parameters.isMember("Resource"))
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	701 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	702 throw OrthancException(ErrorCode_InternalError);
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	703 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	704
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	705 std::string operation = parameters["Operation"].asString();
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	706 size_t index = ParseOperation(lock, operation, operations[i]);
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	707
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	708 std::string resource = parameters["Resource"].asString();
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	709 if (!resource.empty())
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	710 {
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	711 lock.AddDicomInstanceInput(index, context_, resource);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	712 }
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	713 else if (!isFirst)
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	714 {
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	715 lock.Connect(previous, index);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	716 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	717
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	718 isFirst = false;
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	719 previous = index;
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	720 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	721 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	722
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	723
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	724 LuaScripting::LuaScripting(ServerContext& context) :
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	725 context_(context),
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	726 state_(State_Setup)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	728 lua_.SetGlobalVariable("_ServerContext", &context);
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	729 lua_.RegisterFunction("RestApiGet", RestApiGet);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	730 lua_.RegisterFunction("RestApiPost", RestApiPost);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	731 lua_.RegisterFunction("RestApiPut", RestApiPut);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	732 lua_.RegisterFunction("RestApiDelete", RestApiDelete);
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	733 lua_.RegisterFunction("GetOrthancConfiguration", GetOrthancConfiguration);
2738 3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	734
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	735 LOG(INFO) << "Initializing Lua for the event handler";
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	736 LoadGlobalConfiguration();
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	737 }
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	738
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	739
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	740 LuaScripting::~LuaScripting()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	741 {
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	742 if (state_ == State_Running)
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	743 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	744 LOG(ERROR) << "INTERNAL ERROR: LuaScripting::Stop() should be invoked manually to avoid mess in the destruction order!";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	745 Stop();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	746 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	747 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	748
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	749
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	750 void LuaScripting::EventThread(LuaScripting* that)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	751 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	752 for (;;)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	753 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3676 diff changeset	754 std::unique_ptr<IDynamicObject> event(that->pendingEvents_.Dequeue(100));
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	755
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	756 if (event.get() == NULL)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	757 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	758 // The event queue is empty, check whether we should stop
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	759 boost::recursive_mutex::scoped_lock lock(that->mutex_);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	760
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	761 if (that->state_ != State_Running)
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	762 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	763 return;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	764 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	765 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	766 else
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	767 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	768 try
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	769 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	770 dynamic_cast<IEvent&>(event).Apply(that);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	771 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	772 catch (OrthancException& e)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	773 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	774 LOG(ERROR) << "Error while processing Lua events: " << e.What();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	775 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	776 }
3851 6498739a3c3c refactoring: TimeoutDicomConnectionManager is now only used by Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 3845 diff changeset	777
6498739a3c3c refactoring: TimeoutDicomConnectionManager is now only used by Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 3845 diff changeset	778 that->jobManager_.GetDicomConnectionManager().CloseIfInactive();
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	779 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	780 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	781
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	782
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	783 void LuaScripting::Start()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	784 {
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	785 boost::recursive_mutex::scoped_lock lock(mutex_);
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	786
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	787 if (state_ != State_Setup \|\|
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	788 eventThread_.joinable() /* already started */)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	789 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	790 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	791 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	792 else
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	793 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	794 LOG(INFO) << "Starting the Lua engine";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	795 eventThread_ = boost::thread(EventThread, this);
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	796 state_ = State_Running;
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	797 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	798 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	799
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1571 diff changeset	800
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	801 void LuaScripting::Stop()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	802 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	803 {
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	804 boost::recursive_mutex::scoped_lock lock(mutex_);
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1571 diff changeset	805
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	806 if (state_ != State_Running)
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	807 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	808 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	809 }
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1571 diff changeset	810
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	811 state_ = State_Done;
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	812 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	813
2620 1232922c8793 speeding up shutdown if Lua script is in trailing phase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2618 diff changeset	814 jobManager_.AwakeTrailingSleep();
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	815
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	816 if (eventThread_.joinable())
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	817 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	818 LOG(INFO) << "Stopping the Lua engine";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	819 eventThread_.join();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	820 LOG(INFO) << "The Lua engine has stopped";
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	821 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	822 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	823
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	824
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	825 void LuaScripting::SignalStoredInstance(const std::string& publicId,
3916 0e3849268a55 new plugin SDK primitives related to OrthancPluginDicomInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3894 diff changeset	826 const DicomInstanceToStore& instance,
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	827 const Json::Value& simplifiedTags)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	828 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	829 Json::Value metadata = Json::objectValue;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	831 for (ServerIndex::MetadataMap::const_iterator
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	832 it = instance.GetMetadata().begin();
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833 it != instance.GetMetadata().end(); ++it)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	834 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835 if (it->first.first == ResourceType_Instance)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	836 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	837 metadata[EnumerationToString(it->first.second)] = it->second;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	838 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	839 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	840
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	841 pendingEvents_.Enqueue(new OnStoredInstanceEvent(publicId, simplifiedTags, metadata, instance));
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	842 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	843
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	844
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	845 void LuaScripting::SignalChange(const ServerIndexChange& change)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	846 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	847 if (change.GetChangeType() == ChangeType_StablePatient \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	848 change.GetChangeType() == ChangeType_StableStudy \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	849 change.GetChangeType() == ChangeType_StableSeries)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	850 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	851 pendingEvents_.Enqueue(new StableResourceEvent(change));
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	852 }
3676 231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	853 else if (change.GetChangeType() == ChangeType_Deleted)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	854 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	855 pendingEvents_.Enqueue(new DeleteEvent(change.GetResourceType(), change.GetPublicId()));
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	856 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	857 else if (change.GetChangeType() == ChangeType_UpdatedAttachment \|\|
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	858 change.GetChangeType() == ChangeType_UpdatedMetadata)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	859 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	860 pendingEvents_.Enqueue(new UpdateEvent(change.GetResourceType(), change.GetPublicId()));
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	861 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	862 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	864
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	865 bool LuaScripting::FilterIncomingInstance(const DicomInstanceToStore& instance,
0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	866 const Json::Value& simplified)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	868 static const char* NAME = "ReceivedInstanceFilter";
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	869
1456 68827c07e683 fix recursive calls with Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	870 boost::recursive_mutex::scoped_lock lock(mutex_);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	871
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	872 if (lua_.IsExistingFunction(NAME))
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	873 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	874 LuaFunctionCall call(lua_, NAME);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	875 call.PushJson(simplified);
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	876
0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	877 Json::Value origin;
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2638 diff changeset	878 instance.GetOrigin().Format(origin);
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	879 call.PushJson(origin);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	880
3845 281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	881 Json::Value info = Json::objectValue;
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	882 info["HasPixelData"] = instance.HasPixelData();
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	883
4507 b4c58795f3a8 widening the use of DicomTransferSyntax enum Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	884 DicomTransferSyntax s;
3845 281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	885 if (instance.LookupTransferSyntax(s))
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	886 {
4507 b4c58795f3a8 widening the use of DicomTransferSyntax enum Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	887 info["TransferSyntaxUID"] = GetTransferSyntaxUid(s);
3845 281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	888 }
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	889
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	890 call.PushJson(info);
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	891
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	892 if (!call.ExecutePredicate())
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	893 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	894 return false;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	895 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	896 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	897
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	898 return true;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	899 }
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	900
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	901
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	902 void LuaScripting::Execute(const std::string& command)
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	903 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	904 pendingEvents_.Enqueue(new ExecuteEvent(command));
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	905 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	906
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	907
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	908 void LuaScripting::LoadGlobalConfiguration()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	909 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	910 OrthancConfiguration::ReaderLock configLock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	911
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	912 {
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	913 std::string command;
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	914 Orthanc::ServerResources::GetFileResource(command, Orthanc::ServerResources::LUA_TOOLBOX);
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	915 lua_.Execute(command);
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	916 }
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	917
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	918 std::list<std::string> luaScripts;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	919 configLock.GetConfiguration().GetListOfStringsParameter(luaScripts, "LuaScripts");
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	920
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	921 LuaScripting::Lock lock(*this);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	922
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	923 for (std::list<std::string>::const_iterator
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	924 it = luaScripts.begin(); it != luaScripts.end(); ++it)
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	925 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	926 std::string path = configLock.GetConfiguration().InterpretStringParameterAsPath(*it);
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	927 LOG(INFO) << "Installing the Lua scripts from: " << path;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	928 std::string script;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	929 SystemToolbox::ReadFile(script, path);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	930
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	931 lock.GetLua().Execute(script);
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	932 }
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	933 }
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	934
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	935
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	936 void LuaScripting::SignalJobSubmitted(const std::string& jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	937 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	938 pendingEvents_.Enqueue(new JobEvent(JobEvent::Type_Submitted, jobId));
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	939 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	940
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	941
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	942 void LuaScripting::SignalJobSuccess(const std::string& jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	943 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	944 pendingEvents_.Enqueue(new JobEvent(JobEvent::Type_Success, jobId));
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	945 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	946
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	947
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	948 void LuaScripting::SignalJobFailure(const std::string& jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	949 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	950 pendingEvents_.Enqueue(new JobEvent(JobEvent::Type_Failure, jobId));
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	951 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	952 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/LuaScripting.cpp @ 4605:c8f444e8556d