orthanc: OrthancServer/Sources/LuaScripting.cpp annotate

annotate OrthancServer/Sources/LuaScripting.cpp @ 4555:456ed3fcff81 db-changes

cont

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 03 Mar 2021 17:13:41 +0100
parents	efd90f778cd2
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
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	41 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	42 #include "../../OrthancFramework/Sources/HttpServer/StringHttpOutput.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	43 #include "../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	44 #include "../../OrthancFramework/Sources/Lua/LuaFunctionCall.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4031 diff changeset	46 #include <OrthancServerResources.h>
1433 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
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 namespace Orthanc
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	51 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	52 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	53 public:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	54 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	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
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	58 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	59 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	60 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	61 std::string instanceId_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	62 Json::Value simplifiedTags_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	63 Json::Value metadata_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	64 Json::Value origin_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	65
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	66 public:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	67 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	68 const Json::Value& simplifiedTags,
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	69 const Json::Value& metadata,
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	70 const DicomInstanceToStore& instance) :
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	71 instanceId_(instanceId),
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	72 simplifiedTags_(simplifiedTags),
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	73 metadata_(metadata)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	74 {
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2638 diff changeset	75 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	76 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	77
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	78 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	79 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	80 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	81
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	82 LuaScripting::Lock lock(that);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	83
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	84 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	85 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	86 that.InitializeJob();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	87
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	88 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	89 call.PushString(instanceId_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	90 call.PushJson(simplifiedTags_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	91 call.PushJson(metadata_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	92 call.PushJson(origin_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	93 call.Execute();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	94
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	95 that.SubmitJob();
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
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	101 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	102 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	103 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	104 std::string command_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	105
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	106 public:
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	107 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	108 command_(command)
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 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	111
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	112 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	113 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	114 LuaScripting::Lock lock(that);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	115
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	116 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	117 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	118 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	119 call.Execute();
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
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	125 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	126 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	127 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	128 ServerIndexChange change_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	129
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	130 class GetInfoOperations : public ServerIndex::IReadOnlyOperations
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	131 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	132 private:
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	133 const ServerIndexChange& change_;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	134 bool ok_;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	135 DicomMap tags_;
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	136 std::map<MetadataType, std::string> metadata_;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	137
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	138 public:
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	139 explicit GetInfoOperations(const ServerIndexChange& change) :
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	140 change_(change),
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	141 ok_(false)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	142 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	143 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	144
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	145 virtual void Apply(ServerIndex::ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	146 {
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	147 int64_t internalId;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	148 ResourceType level;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	149 if (transaction.LookupResource(internalId, level, change_.GetPublicId()) &&
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	150 level == change_.GetResourceType())
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	151 {
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	152 transaction.GetMainDicomTags(tags_, internalId);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	153 transaction.GetAllMetadata(metadata_, internalId);
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	154 ok_ = true;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	155 }
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	156 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	157
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	158 void CallLua(LuaScripting& that,
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	159 const char* name) const
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	160 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	161 if (ok_)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	162 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	163 Json::Value formattedMetadata = Json::objectValue;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	164
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	165 for (std::map<MetadataType, std::string>::const_iterator
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	166 it = metadata_.begin(); it != metadata_.end(); ++it)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	167 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	168 std::string key = EnumerationToString(it->first);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	169 formattedMetadata[key] = it->second;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	170 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	171
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	172 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	173 LuaScripting::Lock lock(that);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	174
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	175 if (lock.GetLua().IsExistingFunction(name))
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	176 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	177 that.InitializeJob();
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	178
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	179 Json::Value json = Json::objectValue;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	180
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	181 if (change_.GetResourceType() == ResourceType_Study)
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	182 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	183 DicomMap t;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	184 tags_.ExtractStudyInformation(t); // Discard patient-related tags
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	185 FromDcmtkBridge::ToJson(json, t, true);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	186 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	187 else
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	188 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	189 FromDcmtkBridge::ToJson(json, tags_, true);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	190 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	191
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	192 LuaFunctionCall call(lock.GetLua(), name);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	193 call.PushString(change_.GetPublicId());
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	194 call.PushJson(json);
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	195 call.PushJson(formattedMetadata);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	196 call.Execute();
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	197
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	198 that.SubmitJob();
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	199 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	200 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	201 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	202 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	203 };
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	204
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	205
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	206 public:
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	207 explicit StableResourceEvent(const ServerIndexChange& change) :
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	208 change_(change)
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	209 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	210 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	211
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	212 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	213 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	214 const char* name;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	215
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	216 switch (change_.GetChangeType())
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	217 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	218 case ChangeType_StablePatient:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	219 name = "OnStablePatient";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	220 break;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	221
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	222 case ChangeType_StableStudy:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	223 name = "OnStableStudy";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	224 break;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	225
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	226 case ChangeType_StableSeries:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	227 name = "OnStableSeries";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	228 break;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	229
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	230 default:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	231 throw OrthancException(ErrorCode_InternalError);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	232 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	233
2638 25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	234 {
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	235 // 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	236 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	237
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	238 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	239 {
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	240 return;
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	241 }
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	242 }
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	243
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	244 GetInfoOperations operations(change_);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	245 that.context_.GetIndex().Apply(operations);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	246 operations.CallLua(that, name);
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	247 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	248 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	249
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	250
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	251 class LuaScripting::JobEvent : public LuaScripting::IEvent
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 public:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	254 enum Type
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	255 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	256 Type_Failure,
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	257 Type_Submitted,
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	258 Type_Success
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 private:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	262 Type type_;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	263 std::string jobId_;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	264
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	265 public:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	266 JobEvent(Type type,
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	267 const std::string& jobId) :
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	268 type_(type),
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	269 jobId_(jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	270 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	271 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	272
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	273 virtual void Apply(LuaScripting& that) ORTHANC_OVERRIDE
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	274 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	275 std::string functionName;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	276
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	277 switch (type_)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	278 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	279 case Type_Failure:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	280 functionName = "OnJobFailure";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	281 break;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	282
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	283 case Type_Submitted:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	284 functionName = "OnJobSubmitted";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	285 break;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	286
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	287 case Type_Success:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	288 functionName = "OnJobSuccess";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	289 break;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	290
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	291 default:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	292 throw OrthancException(ErrorCode_InternalError);
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	293 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	294
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	295 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	296 LuaScripting::Lock lock(that);
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	297
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	298 if (lock.GetLua().IsExistingFunction(functionName.c_str()))
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	299 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	300 LuaFunctionCall call(lock.GetLua(), functionName.c_str());
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	301 call.PushString(jobId_);
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	302 call.Execute();
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	303 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	304 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	305 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	306 };
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	307
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	308
3676 231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	309 class LuaScripting::DeleteEvent : public LuaScripting::IEvent
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 private:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	312 ResourceType level_;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	313 std::string publicId_;
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 public:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	316 DeleteEvent(ResourceType level,
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	317 const std::string& publicId) :
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	318 level_(level),
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	319 publicId_(publicId)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	320 {
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
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	323 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	324 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	325 std::string functionName;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	326
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	327 switch (level_)
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 case ResourceType_Patient:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	330 functionName = "OnDeletedPatient";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	331 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	332
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	333 case ResourceType_Study:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	334 functionName = "OnDeletedStudy";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	335 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	336
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	337 case ResourceType_Series:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	338 functionName = "OnDeletedSeries";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	339 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	340
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	341 case ResourceType_Instance:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	342 functionName = "OnDeletedInstance";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	343 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	344
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	345 default:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	346 throw OrthancException(ErrorCode_InternalError);
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
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	349 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	350 LuaScripting::Lock lock(that);
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 if (lock.GetLua().IsExistingFunction(functionName.c_str()))
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	353 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	354 LuaFunctionCall call(lock.GetLua(), functionName.c_str());
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	355 call.PushString(publicId_);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	356 call.Execute();
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	357 }
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 }
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
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	362
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	363 class LuaScripting::UpdateEvent : public LuaScripting::IEvent
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 private:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	366 ResourceType level_;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	367 std::string publicId_;
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 public:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	370 UpdateEvent(ResourceType level,
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	371 const std::string& publicId) :
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	372 level_(level),
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	373 publicId_(publicId)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	374 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	375 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	376
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	377 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	378 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	379 std::string functionName;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	380
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	381 switch (level_)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	382 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	383 case ResourceType_Patient:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	384 functionName = "OnUpdatedPatient";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	385 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	386
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	387 case ResourceType_Study:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	388 functionName = "OnUpdatedStudy";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	389 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	390
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	391 case ResourceType_Series:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	392 functionName = "OnUpdatedSeries";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	393 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	394
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	395 case ResourceType_Instance:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	396 functionName = "OnUpdatedInstance";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	397 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	398
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	399 default:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	400 throw OrthancException(ErrorCode_InternalError);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	401 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	402
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	403 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	404 LuaScripting::Lock lock(that);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	405
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	406 if (lock.GetLua().IsExistingFunction(functionName.c_str()))
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	407 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	408 LuaFunctionCall call(lock.GetLua(), functionName.c_str());
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	409 call.PushString(publicId_);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	410 call.Execute();
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	411 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	412 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	413 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	414 };
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	415
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	416
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	417 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	418 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	419 const void* value = LuaContext::GetGlobalVariable(state, "_ServerContext");
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	420 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	421 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	422
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	423
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	424 // Syntax in Lua: RestApiGet(uri, builtin)
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	425 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	426 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	427 ServerContext* serverContext = GetServerContext(state);
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	428 if (serverContext == NULL)
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	429 {
1440 3567503c00a7 lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	430 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	431 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	432 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	433 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	434
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	435 // Check the types of the arguments
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	436 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	437 if (nArgs < 1 \|\| nArgs > 3 \|\|
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	438 !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	439 (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	440 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	441 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	442 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	443 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	444 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	445
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	446 const char* uri = lua_tostring(state, 1);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	447 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	448
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	449 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	450 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	451
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	452 try
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	453 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	454 std::string result;
4329 9dc0e42f868b moving static methods from HttpToolbox to IHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	455 if (IHttpHandler::SimpleGet(result, serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
9dc0e42f868b moving static methods from HttpToolbox to IHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	456 RequestOrigin_Lua, uri, headers))
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	457 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	458 lua_pushlstring(state, result.c_str(), result.size());
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	459 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	460 }
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	461 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	462 catch (OrthancException& e)
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	463 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	464 LOG(ERROR) << "Lua: " << e.What();
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	465 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	466
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	467 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	468 lua_pushnil(state);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	469 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	470 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	471
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	472
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	473 int LuaScripting::RestApiPostOrPut(lua_State *state,
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	474 bool isPost)
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 ServerContext* serverContext = GetServerContext(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	477 if (serverContext == NULL)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	478 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	479 LOG(ERROR) << "Lua: The Orthanc API is unavailable";
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	480 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	481 return 1;
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
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	484 // Check the types of the arguments
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	485 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	486 if (nArgs < 2 \|\| nArgs > 4 \|\|
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	487 !lua_isstring(state, 1) \|\| // URI
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	488 !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	489 (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	490 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	491 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	492 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	493 return 1;
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 const char* uri = lua_tostring(state, 1);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	497 size_t bodySize = 0;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	498 const char* bodyData = lua_tolstring(state, 2, &bodySize);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	499 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	500
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	501 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	502 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	503
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	504 try
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	505 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	506 std::string result;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	507 if (isPost ?
4329 9dc0e42f868b moving static methods from HttpToolbox to IHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	508 IHttpHandler::SimplePost(result, serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
9dc0e42f868b moving static methods from HttpToolbox to IHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	509 RequestOrigin_Lua, uri, bodyData, bodySize, headers) :
9dc0e42f868b moving static methods from HttpToolbox to IHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	510 IHttpHandler::SimplePut(result, serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
9dc0e42f868b moving static methods from HttpToolbox to IHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	511 RequestOrigin_Lua, uri, bodyData, bodySize, headers))
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	512 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	513 lua_pushlstring(state, result.c_str(), result.size());
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	514 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	515 }
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	516 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	517 catch (OrthancException& e)
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	518 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	519 LOG(ERROR) << "Lua: " << e.What();
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	520 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	521
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	522 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	523 lua_pushnil(state);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	524 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	525 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	526
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	527
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	528 // Syntax in Lua: RestApiPost(uri, body, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	529 int LuaScripting::RestApiPost(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	530 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	531 return RestApiPostOrPut(state, true);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	532 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	533
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	534
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	535 // Syntax in Lua: RestApiPut(uri, body, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	536 int LuaScripting::RestApiPut(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	537 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	538 return RestApiPostOrPut(state, false);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	539 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	540
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	541
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	542 // Syntax in Lua: RestApiDelete(uri, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	543 int LuaScripting::RestApiDelete(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	544 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	545 ServerContext* serverContext = GetServerContext(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	546 if (serverContext == NULL)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	547 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	548 LOG(ERROR) << "Lua: The Orthanc API is unavailable";
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	549 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	550 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	551 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	552
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	553 // Check the types of the arguments
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	554 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	555 if (nArgs < 1 \|\| nArgs > 3 \|\|
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	556 !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	557 (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	558 {
1449 164a381abb2b NEWS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	559 LOG(ERROR) << "Lua: Bad parameters to RestApiDelete()";
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	560 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	561 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	562 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	563
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	564 const char* uri = lua_tostring(state, 1);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	565 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	566
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	567 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	568 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	569
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	570 try
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	571 {
4329 9dc0e42f868b moving static methods from HttpToolbox to IHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	572 if (IHttpHandler::SimpleDelete(serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
9dc0e42f868b moving static methods from HttpToolbox to IHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	573 RequestOrigin_Lua, uri, headers))
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	574 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	575 lua_pushboolean(state, 1);
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	576 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	577 }
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	578 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	579 catch (OrthancException& e)
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	580 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	581 LOG(ERROR) << "Lua: " << e.What();
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	582 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	583
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	584 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	585 lua_pushnil(state);
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	586
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	587 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	588 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	589
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	590
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	591 // Syntax in Lua: GetOrthancConfiguration()
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	592 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	593 {
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	594 Json::Value configuration;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	595
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	596 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	597 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	598 configuration = lock.GetJson();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	599 }
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	600
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	601 LuaContext::GetLuaContext(state).PushJson(configuration);
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	602
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	603 return 1;
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	604 }
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	605
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	606
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	607 size_t LuaScripting::ParseOperation(LuaJobManager::Lock& lock,
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	608 const std::string& operation,
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	609 const Json::Value& parameters)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	610 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611 if (operation == "delete")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	613 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	614 return lock.AddDeleteResourceOperation(context_);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	615 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	617 if (operation == "store-scu")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	618 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619 std::string localAet;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620 if (parameters.isMember("LocalAet"))
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	621 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	622 localAet = parameters["LocalAet"].asString();
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	623 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	624 else
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	625 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	626 localAet = context_.GetDefaultLocalApplicationEntityTitle();
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
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	629 std::string name = parameters["Modality"].asString();
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	630 RemoteModalityParameters modality;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	631
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	632 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	633 OrthancConfiguration::ReaderLock configLock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	634 modality = configLock.GetConfiguration().GetModalityUsingSymbolicName(name);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	635 }
2222 21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	636
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	637 // 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	638 return lock.AddStoreScuOperation(context_, localAet, modality);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	641 if (operation == "store-peer")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	642 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	643 OrthancConfiguration::ReaderLock configLock;
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	644 std::string name = parameters["Peer"].asString();
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	645
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	646 WebServiceParameters peer;
2944 f395460af74d simplifying OrthancConfiguration for modalities/peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	647 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	648 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	649 return lock.AddStorePeerOperation(peer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	650 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	651 else
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	652 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	653 throw OrthancException(ErrorCode_UnknownResource,
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	654 "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	655 }
1433 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 if (operation == "modify")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	659 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3676 diff changeset	660 std::unique_ptr<DicomModification> modification(new DicomModification);
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	661 modification->ParseModifyRequest(parameters);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	663 return lock.AddModifyInstanceOperation(context_, modification.release());
1433 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
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	666 if (operation == "call-system")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	667 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	668 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	669
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	670 const Json::Value& argsIn = parameters["Arguments"];
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	671 if (argsIn.type() != Json::arrayValue)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	672 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	673 throw OrthancException(ErrorCode_BadParameterType);
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	674 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	675
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	676 std::vector<std::string> args;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677 args.reserve(argsIn.size());
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	678 for (Json::Value::ArrayIndex i = 0; i < argsIn.size(); ++i)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	679 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	680 // http://jsoncpp.sourceforge.net/namespace_json.html#7d654b75c16a57007925868e38212b4e
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	681 switch (argsIn[i].type())
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	682 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	683 case Json::stringValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684 args.push_back(argsIn[i].asString());
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	686
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	687 case Json::intValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	688 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asInt()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	689 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	690
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	691 case Json::uintValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asUInt()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	693 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	694
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	695 case Json::realValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	696 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asFloat()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	697 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	698
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	699 default:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	700 throw OrthancException(ErrorCode_BadParameterType);
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	701 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	702 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	703
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	704 std::string command = parameters["Command"].asString();
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	705 std::vector<std::string> postArgs;
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	706
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	707 return lock.AddSystemCallOperation(command, args, postArgs);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	708 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	709
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	710 throw OrthancException(ErrorCode_ParameterOutOfRange);
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	711 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	712
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	713
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	714 void LuaScripting::InitializeJob()
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	715 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	716 lua_.Execute("_InitializeJob()");
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	717 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	718
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	719
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	720 void LuaScripting::SubmitJob()
1435 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 Json::Value operations;
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	723 LuaFunctionCall call2(lua_, "_AccessJob");
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	724 call2.ExecuteToJson(operations, false);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	725
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	726 if (operations.type() != Json::arrayValue)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	727 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	728 throw OrthancException(ErrorCode_InternalError);
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	729 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	730
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	731 LuaJobManager::Lock lock(jobManager_, context_.GetJobsEngine());
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	732
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	733 bool isFirst = true;
2727 815e30657dad fix warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 2675 diff changeset	734 size_t previous = 0; // Dummy initialization to avoid warning
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	735
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	736 for (Json::Value::ArrayIndex i = 0; i < operations.size(); ++i)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	737 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	738 if (operations[i].type() != Json::objectValue \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	739 !operations[i].isMember("Operation"))
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	740 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	741 throw OrthancException(ErrorCode_InternalError);
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	742 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	743
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	744 const Json::Value& parameters = operations[i];
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	745 if (!parameters.isMember("Resource"))
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	746 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	747 throw OrthancException(ErrorCode_InternalError);
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	748 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	749
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	750 std::string operation = parameters["Operation"].asString();
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	751 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	752
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	753 std::string resource = parameters["Resource"].asString();
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	754 if (!resource.empty())
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	755 {
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	756 lock.AddDicomInstanceInput(index, context_, resource);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	757 }
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	758 else if (!isFirst)
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	759 {
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	760 lock.Connect(previous, index);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	761 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	762
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	763 isFirst = false;
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	764 previous = index;
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	765 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	766 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	767
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	768
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	769 LuaScripting::LuaScripting(ServerContext& context) :
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	770 context_(context),
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	771 state_(State_Setup)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	772 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	773 lua_.SetGlobalVariable("_ServerContext", &context);
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	774 lua_.RegisterFunction("RestApiGet", RestApiGet);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	775 lua_.RegisterFunction("RestApiPost", RestApiPost);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	776 lua_.RegisterFunction("RestApiPut", RestApiPut);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	777 lua_.RegisterFunction("RestApiDelete", RestApiDelete);
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	778 lua_.RegisterFunction("GetOrthancConfiguration", GetOrthancConfiguration);
2738 3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	779
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	780 LOG(INFO) << "Initializing Lua for the event handler";
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	781 LoadGlobalConfiguration();
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	782 }
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	783
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	784
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	785 LuaScripting::~LuaScripting()
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_Running)
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	788 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	789 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	790 Stop();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	791 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	792 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	793
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	794
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	795 void LuaScripting::EventThread(LuaScripting* that)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	796 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	797 for (;;)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	798 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3676 diff changeset	799 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	800
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	801 if (event.get() == NULL)
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 // The event queue is empty, check whether we should stop
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	804 boost::recursive_mutex::scoped_lock lock(that->mutex_);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	805
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	806 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	807 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	808 return;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	809 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	810 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	811 else
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 try
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	814 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	815 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	816 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	817 catch (OrthancException& e)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	818 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	819 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	820 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	821 }
3851 6498739a3c3c refactoring: TimeoutDicomConnectionManager is now only used by Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 3845 diff changeset	822
6498739a3c3c refactoring: TimeoutDicomConnectionManager is now only used by Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 3845 diff changeset	823 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	824 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	825 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	826
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	827
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	828 void LuaScripting::Start()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	829 {
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	830 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	831
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	832 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	833 eventThread_.joinable() /* already started */)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	834 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	835 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	836 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	837 else
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	838 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	839 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	840 eventThread_ = boost::thread(EventThread, this);
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	841 state_ = State_Running;
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	842 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	843 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	844
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1571 diff changeset	845
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	846 void LuaScripting::Stop()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	847 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	848 {
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	849 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	850
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	851 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	852 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	853 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	854 }
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1571 diff changeset	855
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	856 state_ = State_Done;
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	857 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	858
2620 1232922c8793 speeding up shutdown if Lua script is in trailing phase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2618 diff changeset	859 jobManager_.AwakeTrailingSleep();
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	860
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	861 if (eventThread_.joinable())
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	862 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	863 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	864 eventThread_.join();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	865 LOG(INFO) << "The Lua engine has stopped";
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	866 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	868
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	869
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	870 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	871 const DicomInstanceToStore& instance,
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	872 const Json::Value& simplifiedTags)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	873 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	874 Json::Value metadata = Json::objectValue;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	875
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876 for (ServerIndex::MetadataMap::const_iterator
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	877 it = instance.GetMetadata().begin();
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	878 it != instance.GetMetadata().end(); ++it)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	879 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	880 if (it->first.first == ResourceType_Instance)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	881 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	882 metadata[EnumerationToString(it->first.second)] = it->second;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	883 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	884 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	885
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	886 pendingEvents_.Enqueue(new OnStoredInstanceEvent(publicId, simplifiedTags, metadata, instance));
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	887 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	888
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	889
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	890 void LuaScripting::SignalChange(const ServerIndexChange& change)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	891 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	892 if (change.GetChangeType() == ChangeType_StablePatient \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	893 change.GetChangeType() == ChangeType_StableStudy \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	894 change.GetChangeType() == ChangeType_StableSeries)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	895 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	896 pendingEvents_.Enqueue(new StableResourceEvent(change));
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	897 }
3676 231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	898 else if (change.GetChangeType() == ChangeType_Deleted)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	899 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	900 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	901 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	902 else if (change.GetChangeType() == ChangeType_UpdatedAttachment \|\|
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	903 change.GetChangeType() == ChangeType_UpdatedMetadata)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	904 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	905 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	906 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	907 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	908
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	909
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	910 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	911 const Json::Value& simplified)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	912 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	913 static const char* NAME = "ReceivedInstanceFilter";
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	914
1456 68827c07e683 fix recursive calls with Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	915 boost::recursive_mutex::scoped_lock lock(mutex_);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	916
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	917 if (lua_.IsExistingFunction(NAME))
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	918 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	919 LuaFunctionCall call(lua_, NAME);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	920 call.PushJson(simplified);
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	921
0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	922 Json::Value origin;
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2638 diff changeset	923 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	924 call.PushJson(origin);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	925
3845 281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	926 Json::Value info = Json::objectValue;
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	927 info["HasPixelData"] = instance.HasPixelData();
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	928
4507 b4c58795f3a8 widening the use of DicomTransferSyntax enum Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	929 DicomTransferSyntax s;
3845 281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	930 if (instance.LookupTransferSyntax(s))
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	931 {
4507 b4c58795f3a8 widening the use of DicomTransferSyntax enum Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	932 info["TransferSyntaxUID"] = GetTransferSyntaxUid(s);
3845 281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	933 }
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	934
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	935 call.PushJson(info);
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	936
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	937 if (!call.ExecutePredicate())
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	938 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	939 return false;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	942
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	943 return true;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	944 }
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	945
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	946
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	947 void LuaScripting::Execute(const std::string& command)
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	948 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	949 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	950 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	951
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	952
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	953 void LuaScripting::LoadGlobalConfiguration()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	954 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	955 OrthancConfiguration::ReaderLock configLock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	956
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	957 {
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	958 std::string command;
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	959 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	960 lua_.Execute(command);
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	961 }
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	962
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	963 std::list<std::string> luaScripts;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	964 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	965
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	966 LuaScripting::Lock lock(*this);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	967
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	968 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	969 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	970 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	971 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	972 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	973 std::string script;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	974 SystemToolbox::ReadFile(script, path);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	975
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	976 lock.GetLua().Execute(script);
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	977 }
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	978 }
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	979
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	980
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	981 void LuaScripting::SignalJobSubmitted(const std::string& jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	982 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	983 pendingEvents_.Enqueue(new JobEvent(JobEvent::Type_Submitted, jobId));
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	984 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	985
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	986
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	987 void LuaScripting::SignalJobSuccess(const std::string& jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	988 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	989 pendingEvents_.Enqueue(new JobEvent(JobEvent::Type_Success, jobId));
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	990 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	991
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	992
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	993 void LuaScripting::SignalJobFailure(const std::string& jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	994 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	995 pendingEvents_.Enqueue(new JobEvent(JobEvent::Type_Failure, jobId));
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	996 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	997 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/LuaScripting.cpp @ 4555:456ed3fcff81 db-changes