orthanc: OrthancServer/Sources/LuaScripting.cpp annotate

annotate OrthancServer/Sources/LuaScripting.cpp @ 5676:b744a2cf408a find-refactoring tip

shorten ParentRetrieveSpecification/ChildrenRetrieveSpecification as ParentSpecification/ChildrenSpecification

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sat, 06 Jul 2024 15:04:28 +0200
parents	f7adfb22e20e
children

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
5640 f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
5485 48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5460 diff changeset	7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 *
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * This program is free software: you can redistribute it and/or
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * modify it under the terms of the GNU General Public License as
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * published by the Free Software Foundation, either version 3 of the
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * License, or (at your option) any later version.
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 *
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * 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	15 * WITHOUT ANY WARRANTY; without even the implied warranty of
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * General Public License for more details.
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 *
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * You should have received a copy of the GNU General Public License
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
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 #include "PrecompiledHeadersServer.h"
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 #include "LuaScripting.h"
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	27 #include "OrthancConfiguration.h"
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	28 #include "OrthancRestApi/OrthancRestApi.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 #include "ServerContext.h"
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	30
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	31 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	32 #include "../../OrthancFramework/Sources/HttpServer/StringHttpOutput.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	33 #include "../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	34 #include "../../OrthancFramework/Sources/Lua/LuaFunctionCall.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4031 diff changeset	36 #include <OrthancServerResources.h>
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37
5023 c8c98389080f use constant for multiply occurring string Sebastien Jodogne <s.jodogne@gmail.com> parents: 5022 diff changeset	38 static const char* ON_HEART_BEAT = "OnHeartBeat";
c8c98389080f use constant for multiply occurring string Sebastien Jodogne <s.jodogne@gmail.com> parents: 5022 diff changeset	39
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 namespace Orthanc
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	43 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	44 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	45 public:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	46 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	47 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	48
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	49
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	50 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	51 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	52 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	53 std::string instanceId_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	54 Json::Value simplifiedTags_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	55 Json::Value metadata_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	56 Json::Value origin_;
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 public:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	59 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	60 const Json::Value& simplifiedTags,
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	61 const Json::Value& metadata,
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	62 const DicomInstanceToStore& instance) :
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	63 instanceId_(instanceId),
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	64 simplifiedTags_(simplifiedTags),
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	65 metadata_(metadata)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	66 {
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2638 diff changeset	67 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	68 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	69
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	70 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	71 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	72 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	73
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	74 LuaScripting::Lock lock(that);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	75
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	76 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	77 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	78 that.InitializeJob();
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 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	81 call.PushString(instanceId_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	82 call.PushJson(simplifiedTags_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	83 call.PushJson(metadata_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	84 call.PushJson(origin_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	85 call.Execute();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	86
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	87 that.SubmitJob();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	88 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	89 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	90 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	91
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	92
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	93 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	94 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	95 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	96 std::string command_;
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 public:
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	99 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	100 command_(command)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	101 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	102 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	103
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	104 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	105 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	106 LuaScripting::Lock lock(that);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	107
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	108 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	109 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	110 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	111 call.Execute();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	112 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	113 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	114 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	115
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	116
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	117 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	118 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	119 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	120 ServerIndexChange change_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	121
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	122 class GetInfoOperations : public ServerIndex::IReadOnlyOperations
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	123 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	124 private:
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	125 const ServerIndexChange& change_;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	126 bool ok_;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	127 DicomMap tags_;
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	128 std::map<MetadataType, std::string> metadata_;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	129
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	130 public:
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	131 explicit GetInfoOperations(const ServerIndexChange& change) :
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	132 change_(change),
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	133 ok_(false)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	134 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	135 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	136
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	137 virtual void Apply(ServerIndex::ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	138 {
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	139 int64_t internalId;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	140 ResourceType level;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	141 if (transaction.LookupResource(internalId, level, change_.GetPublicId()) &&
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	142 level == change_.GetResourceType())
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	143 {
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	144 transaction.GetMainDicomTags(tags_, internalId);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	145 transaction.GetAllMetadata(metadata_, internalId);
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	146 ok_ = true;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	147 }
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	148 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	149
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	150 void CallLua(LuaScripting& that,
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	151 const char* name) const
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	152 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	153 if (ok_)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	154 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	155 Json::Value formattedMetadata = Json::objectValue;
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 for (std::map<MetadataType, std::string>::const_iterator
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	158 it = metadata_.begin(); it != metadata_.end(); ++it)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	159 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	160 std::string key = EnumerationToString(it->first);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	161 formattedMetadata[key] = it->second;
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
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 LuaScripting::Lock lock(that);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	166
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	167 if (lock.GetLua().IsExistingFunction(name))
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	168 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	169 that.InitializeJob();
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	170
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	171 Json::Value json = Json::objectValue;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	172
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	173 if (change_.GetResourceType() == ResourceType_Study)
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	174 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	175 DicomMap t;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	176 tags_.ExtractStudyInformation(t); // Discard patient-related tags
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4606 diff changeset	177 FromDcmtkBridge::ToJson(json, t, DicomToJsonFormat_Human);
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	178 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	179 else
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	180 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4606 diff changeset	181 FromDcmtkBridge::ToJson(json, tags_, DicomToJsonFormat_Human);
4554 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
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	184 LuaFunctionCall call(lock.GetLua(), name);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	185 call.PushString(change_.GetPublicId());
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	186 call.PushJson(json);
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	187 call.PushJson(formattedMetadata);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	188 call.Execute();
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	189
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	190 that.SubmitJob();
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	191 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	192 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	193 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	194 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	195 };
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	196
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	197
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	198 public:
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	199 explicit StableResourceEvent(const ServerIndexChange& change) :
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	200 change_(change)
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	201 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	202 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	203
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	204 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	205 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	206 const char* name;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	207
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	208 switch (change_.GetChangeType())
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 case ChangeType_StablePatient:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	211 name = "OnStablePatient";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	212 break;
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 case ChangeType_StableStudy:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	215 name = "OnStableStudy";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	216 break;
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_StableSeries:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	219 name = "OnStableSeries";
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 default:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	223 throw OrthancException(ErrorCode_InternalError);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	224 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	225
2638 25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	226 {
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	227 // 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	228 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	229
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	230 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	231 {
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	232 return;
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	233 }
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
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	236 GetInfoOperations operations(change_);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	237 that.context_.GetIndex().Apply(operations);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	238 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	239 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	240 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	241
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	242
5410 16cbfefa15e9 Solved a deadlock related to the Job Engine events and plugins Alain Mazy <am@osimis.io> parents: 5185 diff changeset	243 class LuaScripting::LuaJobEvent : public LuaScripting::IEvent
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	244 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	245 private:
5410 16cbfefa15e9 Solved a deadlock related to the Job Engine events and plugins Alain Mazy <am@osimis.io> parents: 5185 diff changeset	246 JobEvent event_;
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	247
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	248 public:
5460 1474fd6ea6c6 CppCheck Alain Mazy <am@osimis.io> parents: 5450 diff changeset	249 explicit LuaJobEvent(const JobEvent& event) :
5410 16cbfefa15e9 Solved a deadlock related to the Job Engine events and plugins Alain Mazy <am@osimis.io> parents: 5185 diff changeset	250 event_(event)
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	251 {
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
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	254 virtual void Apply(LuaScripting& that) ORTHANC_OVERRIDE
2675 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 std::string functionName;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	257
5410 16cbfefa15e9 Solved a deadlock related to the Job Engine events and plugins Alain Mazy <am@osimis.io> parents: 5185 diff changeset	258 switch (event_.GetEventType())
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	259 {
5410 16cbfefa15e9 Solved a deadlock related to the Job Engine events and plugins Alain Mazy <am@osimis.io> parents: 5185 diff changeset	260 case JobEventType_Failure:
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	261 functionName = "OnJobFailure";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	262 break;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	263
5410 16cbfefa15e9 Solved a deadlock related to the Job Engine events and plugins Alain Mazy <am@osimis.io> parents: 5185 diff changeset	264 case JobEventType_Submitted:
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	265 functionName = "OnJobSubmitted";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	266 break;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	267
5410 16cbfefa15e9 Solved a deadlock related to the Job Engine events and plugins Alain Mazy <am@osimis.io> parents: 5185 diff changeset	268 case JobEventType_Success:
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	269 functionName = "OnJobSuccess";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	270 break;
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 default:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	273 throw OrthancException(ErrorCode_InternalError);
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
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 LuaScripting::Lock lock(that);
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 if (lock.GetLua().IsExistingFunction(functionName.c_str()))
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	280 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	281 LuaFunctionCall call(lock.GetLua(), functionName.c_str());
5410 16cbfefa15e9 Solved a deadlock related to the Job Engine events and plugins Alain Mazy <am@osimis.io> parents: 5185 diff changeset	282 call.PushString(event_.GetJobId());
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	283 call.Execute();
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	284 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	285 }
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 };
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	288
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	289
3676 231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	290 class LuaScripting::DeleteEvent : public LuaScripting::IEvent
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	291 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	292 private:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	293 ResourceType level_;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	294 std::string publicId_;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	295
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	296 public:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	297 DeleteEvent(ResourceType level,
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	298 const std::string& publicId) :
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	299 level_(level),
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	300 publicId_(publicId)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	301 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	302 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	303
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	304 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	305 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	306 std::string functionName;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	307
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	308 switch (level_)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	309 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	310 case ResourceType_Patient:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	311 functionName = "OnDeletedPatient";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	312 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	313
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	314 case ResourceType_Study:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	315 functionName = "OnDeletedStudy";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	316 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	317
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	318 case ResourceType_Series:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	319 functionName = "OnDeletedSeries";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	320 break;
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 case ResourceType_Instance:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	323 functionName = "OnDeletedInstance";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	324 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	325
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	326 default:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	327 throw OrthancException(ErrorCode_InternalError);
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
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	330 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	331 LuaScripting::Lock lock(that);
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 if (lock.GetLua().IsExistingFunction(functionName.c_str()))
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	334 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	335 LuaFunctionCall call(lock.GetLua(), functionName.c_str());
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	336 call.PushString(publicId_);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	337 call.Execute();
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	338 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	339 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	340 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	341 };
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	342
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	343
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	344 class LuaScripting::UpdateEvent : public LuaScripting::IEvent
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	345 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	346 private:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	347 ResourceType level_;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	348 std::string publicId_;
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 public:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	351 UpdateEvent(ResourceType level,
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	352 const std::string& publicId) :
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	353 level_(level),
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	354 publicId_(publicId)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	355 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	356 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	357
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	358 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	359 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	360 std::string functionName;
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 switch (level_)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	363 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	364 case ResourceType_Patient:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	365 functionName = "OnUpdatedPatient";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	366 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	367
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	368 case ResourceType_Study:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	369 functionName = "OnUpdatedStudy";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	370 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	371
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	372 case ResourceType_Series:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	373 functionName = "OnUpdatedSeries";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	374 break;
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 case ResourceType_Instance:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	377 functionName = "OnUpdatedInstance";
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	378 break;
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	379
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	380 default:
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	381 throw OrthancException(ErrorCode_InternalError);
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
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	384 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	385 LuaScripting::Lock lock(that);
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 if (lock.GetLua().IsExistingFunction(functionName.c_str()))
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	388 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	389 LuaFunctionCall call(lock.GetLua(), functionName.c_str());
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	390 call.PushString(publicId_);
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	391 call.Execute();
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	392 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	393 }
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 };
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	396
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	397
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	398 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	399 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	400 const void* value = LuaContext::GetGlobalVariable(state, "_ServerContext");
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	401 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	402 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	403
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	404
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	405 // Syntax in Lua: RestApiGet(uri, builtin)
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	406 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	407 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	408 ServerContext* serverContext = GetServerContext(state);
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	409 if (serverContext == NULL)
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	410 {
1440 3567503c00a7 lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	411 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	412 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	413 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	414 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	415
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	416 // Check the types of the arguments
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	417 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	418 if (nArgs < 1 \|\| nArgs > 3 \|\|
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	419 !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	420 (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	421 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	422 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	423 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	424 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	425 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	426
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	427 const char* uri = lua_tostring(state, 1);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	428 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	429
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	430 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	431 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	432
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	433 try
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	434 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	435 std::string result;
4605 c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	436 if (IHttpHandler::SimpleGet(result, NULL, serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	437 RequestOrigin_Lua, uri, headers) == HttpStatus_200_Ok)
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	438 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	439 lua_pushlstring(state, result.c_str(), result.size());
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	440 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	441 }
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	442 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	443 catch (OrthancException& e)
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	444 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	445 LOG(ERROR) << "Lua: " << e.What();
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	446 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	447
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	448 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	449 lua_pushnil(state);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	450 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	451 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	452
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	453
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	454 int LuaScripting::RestApiPostOrPut(lua_State *state,
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	455 bool isPost)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	456 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	457 ServerContext* serverContext = GetServerContext(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	458 if (serverContext == NULL)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	459 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	460 LOG(ERROR) << "Lua: The Orthanc API is unavailable";
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	461 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	462 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	463 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	464
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	465 // Check the types of the arguments
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	466 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	467 if (nArgs < 2 \|\| nArgs > 4 \|\|
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	468 !lua_isstring(state, 1) \|\| // URI
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	469 !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	470 (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	471 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	472 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	473 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	474 return 1;
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
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	477 const char* uri = lua_tostring(state, 1);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	478 size_t bodySize = 0;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	479 const char* bodyData = lua_tolstring(state, 2, &bodySize);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	480 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	481
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	482 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	483 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	484
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	485 try
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	486 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	487 std::string result;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	488 if (isPost ?
4605 c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	489 IHttpHandler::SimplePost(result, NULL,
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	490 serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	491 RequestOrigin_Lua, uri, bodyData, bodySize, headers) == HttpStatus_200_Ok :
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	492 IHttpHandler::SimplePut(result, NULL,
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	493 serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	494 RequestOrigin_Lua, uri, bodyData, bodySize, headers) == HttpStatus_200_Ok)
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	495 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	496 lua_pushlstring(state, result.c_str(), result.size());
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	497 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	498 }
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	499 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	500 catch (OrthancException& e)
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	501 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	502 LOG(ERROR) << "Lua: " << e.What();
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	503 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	504
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	505 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	506 lua_pushnil(state);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	507 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	508 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	509
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	510
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	511 // Syntax in Lua: RestApiPost(uri, body, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	512 int LuaScripting::RestApiPost(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	513 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	514 return RestApiPostOrPut(state, true);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	515 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	516
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	517
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	518 // Syntax in Lua: RestApiPut(uri, body, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	519 int LuaScripting::RestApiPut(lua_State *state)
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 return RestApiPostOrPut(state, false);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	522 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	523
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	524
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	525 // Syntax in Lua: RestApiDelete(uri, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	526 int LuaScripting::RestApiDelete(lua_State *state)
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 ServerContext* serverContext = GetServerContext(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	529 if (serverContext == NULL)
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 LOG(ERROR) << "Lua: The Orthanc API is unavailable";
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	532 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	533 return 1;
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
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	536 // Check the types of the arguments
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	537 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	538 if (nArgs < 1 \|\| nArgs > 3 \|\|
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	539 !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	540 (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	541 {
1449 164a381abb2b NEWS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	542 LOG(ERROR) << "Lua: Bad parameters to RestApiDelete()";
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	543 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	544 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	545 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	546
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	547 const char* uri = lua_tostring(state, 1);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	548 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	549
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	550 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	551 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	552
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	553 try
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	554 {
4605 c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	555 if (IHttpHandler::SimpleDelete(NULL, serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
c8f444e8556d new function in the plugin SDK: OrthancPluginCallRestApi() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	556 RequestOrigin_Lua, uri, headers) == HttpStatus_200_Ok)
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	557 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	558 lua_pushboolean(state, 1);
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	559 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	560 }
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	561 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	562 catch (OrthancException& e)
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	563 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	564 LOG(ERROR) << "Lua: " << e.What();
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	565 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	566
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	567 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	568 lua_pushnil(state);
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	569
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	570 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	571 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	572
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	573
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	574 // Syntax in Lua: GetOrthancConfiguration()
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	575 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	576 {
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	577 Json::Value configuration;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	578
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	579 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	580 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	581 configuration = lock.GetJson();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	582 }
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	583
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	584 LuaContext::GetLuaContext(state).PushJson(configuration);
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	585
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	586 return 1;
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	587 }
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	588
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	589
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	590 size_t LuaScripting::ParseOperation(LuaJobManager::Lock& lock,
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	591 const std::string& operation,
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	592 const Json::Value& parameters)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 if (operation == "delete")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	596 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	597 return lock.AddDeleteResourceOperation(context_);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	598 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	599
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	600 if (operation == "store-scu")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	602 std::string localAet;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 if (parameters.isMember("LocalAet"))
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	605 localAet = parameters["LocalAet"].asString();
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	606 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607 else
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	608 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	609 localAet = context_.GetDefaultLocalApplicationEntityTitle();
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
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	612 std::string name = parameters["Modality"].asString();
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	613 RemoteModalityParameters modality;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	614
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	615 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	616 OrthancConfiguration::ReaderLock configLock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	617 modality = configLock.GetConfiguration().GetModalityUsingSymbolicName(name);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	618 }
2222 21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	619
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	620 // 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	621 return lock.AddStoreScuOperation(context_, localAet, modality);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	622 }
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 if (operation == "store-peer")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	625 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	626 OrthancConfiguration::ReaderLock configLock;
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	627 std::string name = parameters["Peer"].asString();
1433 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 WebServiceParameters peer;
2944 f395460af74d simplifying OrthancConfiguration for modalities/peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	630 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	631 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	632 return lock.AddStorePeerOperation(peer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	633 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	634 else
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	635 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	636 throw OrthancException(ErrorCode_UnknownResource,
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2944 diff changeset	637 "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	638 }
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 == "modify")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	642 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3676 diff changeset	643 std::unique_ptr<DicomModification> modification(new DicomModification);
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	644 modification->ParseModifyRequest(parameters);
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 return lock.AddModifyInstanceOperation(context_, modification.release());
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649 if (operation == "call-system")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	651 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	652
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653 const Json::Value& argsIn = parameters["Arguments"];
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	654 if (argsIn.type() != Json::arrayValue)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656 throw OrthancException(ErrorCode_BadParameterType);
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
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	659 std::vector<std::string> args;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	660 args.reserve(argsIn.size());
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	661 for (Json::Value::ArrayIndex i = 0; i < argsIn.size(); ++i)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663 // http://jsoncpp.sourceforge.net/namespace_json.html#7d654b75c16a57007925868e38212b4e
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664 switch (argsIn[i].type())
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 case Json::stringValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	667 args.push_back(argsIn[i].asString());
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	668 break;
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 case Json::intValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	671 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asInt()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	672 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	673
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	674 case Json::uintValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	675 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asUInt()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	676 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	678 case Json::realValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	679 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asFloat()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	680 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	681
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	682 default:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	683 throw OrthancException(ErrorCode_BadParameterType);
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	686
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	687 std::string command = parameters["Command"].asString();
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	688 std::vector<std::string> postArgs;
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	689
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	690 return lock.AddSystemCallOperation(command, args, postArgs);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	691 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	693 throw OrthancException(ErrorCode_ParameterOutOfRange);
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
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	696
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	697 void LuaScripting::InitializeJob()
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	698 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	699 lua_.Execute("_InitializeJob()");
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	700 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	701
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	702
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	703 void LuaScripting::SubmitJob()
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	704 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	705 Json::Value operations;
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	706 LuaFunctionCall call2(lua_, "_AccessJob");
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	707 call2.ExecuteToJson(operations, false);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	708
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	709 if (operations.type() != Json::arrayValue)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	710 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	711 throw OrthancException(ErrorCode_InternalError);
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	712 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	713
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	714 LuaJobManager::Lock lock(jobManager_, context_.GetJobsEngine());
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	715
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	716 bool isFirst = true;
2727 815e30657dad fix warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 2675 diff changeset	717 size_t previous = 0; // Dummy initialization to avoid warning
1435 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 for (Json::Value::ArrayIndex i = 0; i < operations.size(); ++i)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	720 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	721 if (operations[i].type() != Json::objectValue \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	722 !operations[i].isMember("Operation"))
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	723 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	724 throw OrthancException(ErrorCode_InternalError);
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
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	727 const Json::Value& parameters = operations[i];
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	728 if (!parameters.isMember("Resource"))
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 throw OrthancException(ErrorCode_InternalError);
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	731 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	732
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	733 std::string operation = parameters["Operation"].asString();
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	734 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	735
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	736 std::string resource = parameters["Resource"].asString();
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	737 if (!resource.empty())
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	738 {
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	739 lock.AddDicomInstanceInput(index, context_, resource);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	740 }
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	741 else if (!isFirst)
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	742 {
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	743 lock.Connect(previous, index);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	744 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	745
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	746 isFirst = false;
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	747 previous = index;
1435 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 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	750
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	751
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	752 LuaScripting::LuaScripting(ServerContext& context) :
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	753 context_(context),
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	754 state_(State_Setup),
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	755 heartBeatPeriod_(0)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	756 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	757 lua_.SetGlobalVariable("_ServerContext", &context);
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	758 lua_.RegisterFunction("RestApiGet", RestApiGet);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	759 lua_.RegisterFunction("RestApiPost", RestApiPost);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	760 lua_.RegisterFunction("RestApiPut", RestApiPut);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	761 lua_.RegisterFunction("RestApiDelete", RestApiDelete);
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	762 lua_.RegisterFunction("GetOrthancConfiguration", GetOrthancConfiguration);
2738 3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	763
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	764 LOG(INFO) << "Initializing Lua for the event handler";
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	765 LoadGlobalConfiguration();
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	766 }
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	767
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	768
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	769 LuaScripting::~LuaScripting()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	770 {
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	771 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	772 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	773 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	774 Stop();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	775 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	776 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	777
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	778 void LuaScripting::HeartBeatThread(LuaScripting* that)
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	779 {
5450 9ffd6d18daf3 log lines now contain the thread name Alain Mazy <am@osimis.io> parents: 5410 diff changeset	780 Logging::SetCurrentThreadName("LUA-HEARTBEAT");
9ffd6d18daf3 log lines now contain the thread name Alain Mazy <am@osimis.io> parents: 5410 diff changeset	781
5022 3d0a084e1ace fix to non-static variable Sebastien Jodogne <s.jodogne@gmail.com> parents: 5018 diff changeset	782 static const unsigned int GRANULARITY = 100; // In milliseconds
3d0a084e1ace fix to non-static variable Sebastien Jodogne <s.jodogne@gmail.com> parents: 5018 diff changeset	783
3d0a084e1ace fix to non-static variable Sebastien Jodogne <s.jodogne@gmail.com> parents: 5018 diff changeset	784 const boost::posix_time::time_duration PERIODICITY =
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	785 boost::posix_time::seconds(that->heartBeatPeriod_);
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	786
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	787 boost::posix_time::ptime next =
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	788 boost::posix_time::microsec_clock::universal_time() + PERIODICITY;
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	789
5018 eb8ca3403983 fix: lock mutex when accessing state in HeartBeatThread Alain Mazy <am@osimis.io> parents: 5017 diff changeset	790 bool shouldStop = false;
eb8ca3403983 fix: lock mutex when accessing state in HeartBeatThread Alain Mazy <am@osimis.io> parents: 5017 diff changeset	791
eb8ca3403983 fix: lock mutex when accessing state in HeartBeatThread Alain Mazy <am@osimis.io> parents: 5017 diff changeset	792 while (!shouldStop)
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	793 {
5022 3d0a084e1ace fix to non-static variable Sebastien Jodogne <s.jodogne@gmail.com> parents: 5018 diff changeset	794 boost::this_thread::sleep(boost::posix_time::milliseconds(GRANULARITY));
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	795
5018 eb8ca3403983 fix: lock mutex when accessing state in HeartBeatThread Alain Mazy <am@osimis.io> parents: 5017 diff changeset	796 if (boost::posix_time::microsec_clock::universal_time() >= next)
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	797 {
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	798 LuaScripting::Lock lock(*that);
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	799
5023 c8c98389080f use constant for multiply occurring string Sebastien Jodogne <s.jodogne@gmail.com> parents: 5022 diff changeset	800 if (lock.GetLua().IsExistingFunction(ON_HEART_BEAT))
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	801 {
5023 c8c98389080f use constant for multiply occurring string Sebastien Jodogne <s.jodogne@gmail.com> parents: 5022 diff changeset	802 LuaFunctionCall call(lock.GetLua(), ON_HEART_BEAT);
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	803 call.Execute();
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	804 }
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	805
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	806 next = boost::posix_time::microsec_clock::universal_time() + PERIODICITY;
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	807 }
5018 eb8ca3403983 fix: lock mutex when accessing state in HeartBeatThread Alain Mazy <am@osimis.io> parents: 5017 diff changeset	808
5022 3d0a084e1ace fix to non-static variable Sebastien Jodogne <s.jodogne@gmail.com> parents: 5018 diff changeset	809 {
3d0a084e1ace fix to non-static variable Sebastien Jodogne <s.jodogne@gmail.com> parents: 5018 diff changeset	810 boost::recursive_mutex::scoped_lock lock(that->mutex_);
3d0a084e1ace fix to non-static variable Sebastien Jodogne <s.jodogne@gmail.com> parents: 5018 diff changeset	811 shouldStop = (that->state_ == State_Done);
3d0a084e1ace fix to non-static variable Sebastien Jodogne <s.jodogne@gmail.com> parents: 5018 diff changeset	812 }
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	813 }
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	814 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	815
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	816 void LuaScripting::EventThread(LuaScripting* that)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	817 {
5450 9ffd6d18daf3 log lines now contain the thread name Alain Mazy <am@osimis.io> parents: 5410 diff changeset	818 Logging::SetCurrentThreadName("LUA-EVENTS");
9ffd6d18daf3 log lines now contain the thread name Alain Mazy <am@osimis.io> parents: 5410 diff changeset	819
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	820 for (;;)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	821 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3676 diff changeset	822 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	823
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	824 if (event.get() == NULL)
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 // The event queue is empty, check whether we should stop
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	827 boost::recursive_mutex::scoped_lock lock(that->mutex_);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	828
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	829 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	830 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	831 return;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	832 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	833 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	834 else
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	835 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	836 try
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	837 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	838 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	839 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	840 catch (OrthancException& e)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	841 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	842 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	843 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	844 }
3851 6498739a3c3c refactoring: TimeoutDicomConnectionManager is now only used by Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 3845 diff changeset	845
6498739a3c3c refactoring: TimeoutDicomConnectionManager is now only used by Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 3845 diff changeset	846 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	847 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	848 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	849
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	850
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	851 void LuaScripting::Start()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	852 {
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	853 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	854
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	855 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	856 eventThread_.joinable() /* already started */)
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 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	859 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	860 else
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	861 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	862 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	863 eventThread_ = boost::thread(EventThread, this);
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	864
5026 bafef43b6f37 cppcheck Alain Mazy <am@osimis.io> parents: 5018 diff changeset	865 LuaScripting::Lock luaLock(*this);
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	866
5027 06ffe03d008a merge Alain Mazy <am@osimis.io> parents: 5026 5023 diff changeset	867 if (heartBeatPeriod_ > 0 && luaLock.GetLua().IsExistingFunction(ON_HEART_BEAT))
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	868 {
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	869 LOG(INFO) << "Starting the Lua HeartBeat thread with a period of " << heartBeatPeriod_ << " seconds";
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	870 heartBeatThread_ = boost::thread(HeartBeatThread, this);
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	871 }
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	872 state_ = State_Running;
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	873 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	874 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	875
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1571 diff changeset	876
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	877 void LuaScripting::Stop()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	878 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	879 {
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	880 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	881
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	882 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	883 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	884 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	885 }
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1571 diff changeset	886
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	887 state_ = State_Done;
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	888 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	889
2620 1232922c8793 speeding up shutdown if Lua script is in trailing phase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2618 diff changeset	890 jobManager_.AwakeTrailingSleep();
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	891
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	892 if (eventThread_.joinable())
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	893 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	894 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	895 eventThread_.join();
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	896 if (heartBeatThread_.joinable())
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	897 {
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	898 heartBeatThread_.join();
0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	899 }
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	900 LOG(INFO) << "The Lua engine has stopped";
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	901 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	902 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	903
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	904
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	905 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	906 const DicomInstanceToStore& instance,
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	907 const Json::Value& simplifiedTags)
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 Json::Value metadata = Json::objectValue;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	911 for (ServerIndex::MetadataMap::const_iterator
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	912 it = instance.GetMetadata().begin();
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	913 it != instance.GetMetadata().end(); ++it)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	914 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	915 if (it->first.first == ResourceType_Instance)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	916 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	917 metadata[EnumerationToString(it->first.second)] = it->second;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	918 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	919 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	920
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	921 pendingEvents_.Enqueue(new OnStoredInstanceEvent(publicId, simplifiedTags, metadata, instance));
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	922 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	923
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	924
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	925 void LuaScripting::SignalChange(const ServerIndexChange& change)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	926 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	927 if (change.GetChangeType() == ChangeType_StablePatient \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	928 change.GetChangeType() == ChangeType_StableStudy \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	929 change.GetChangeType() == ChangeType_StableSeries)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	930 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	931 pendingEvents_.Enqueue(new StableResourceEvent(change));
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	932 }
3676 231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	933 else if (change.GetChangeType() == ChangeType_Deleted)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	934 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	935 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	936 }
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	937 else if (change.GetChangeType() == ChangeType_UpdatedAttachment \|\|
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	938 change.GetChangeType() == ChangeType_UpdatedMetadata)
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	939 {
231b46ce1984 Lua events for deleted/updated resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	940 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	941 }
1433 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
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	944
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	945 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	946 const Json::Value& simplified)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	948 static const char* NAME = "ReceivedInstanceFilter";
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	949
1456 68827c07e683 fix recursive calls with Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	950 boost::recursive_mutex::scoped_lock lock(mutex_);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	951
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	952 if (lua_.IsExistingFunction(NAME))
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	953 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	954 LuaFunctionCall call(lua_, NAME);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	955 call.PushJson(simplified);
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	956
0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	957 Json::Value origin;
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2638 diff changeset	958 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	959 call.PushJson(origin);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	960
3845 281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	961 Json::Value info = Json::objectValue;
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	962 info["HasPixelData"] = instance.HasPixelData();
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	963
4507 b4c58795f3a8 widening the use of DicomTransferSyntax enum Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	964 DicomTransferSyntax s;
3845 281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	965 if (instance.LookupTransferSyntax(s))
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	966 {
4507 b4c58795f3a8 widening the use of DicomTransferSyntax enum Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	967 info["TransferSyntaxUID"] = GetTransferSyntaxUid(s);
3845 281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	968 }
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	969
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	970 call.PushJson(info);
281045a1e6db new "info" field in "ReceivedInstanceFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	971
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	972 if (!call.ExecutePredicate())
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	973 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	974 return false;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	975 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	976 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	977
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	978 return true;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	979 }
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	980
4921 309fb4f02704 fix signature of OrthancPluginIncomingCStoreInstanceFilter Sebastien Jodogne <s.jodogne@gmail.com> parents: 4892 diff changeset	981 bool LuaScripting::FilterIncomingCStoreInstance(uint16_t& dimseStatus,
309fb4f02704 fix signature of OrthancPluginIncomingCStoreInstanceFilter Sebastien Jodogne <s.jodogne@gmail.com> parents: 4892 diff changeset	982 const DicomInstanceToStore& instance,
309fb4f02704 fix signature of OrthancPluginIncomingCStoreInstanceFilter Sebastien Jodogne <s.jodogne@gmail.com> parents: 4892 diff changeset	983 const Json::Value& simplified)
4796 94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	984 {
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	985 static const char* NAME = "ReceivedCStoreInstanceFilter";
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	986
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	987 boost::recursive_mutex::scoped_lock lock(mutex_);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	988
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	989 if (lua_.IsExistingFunction(NAME))
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	990 {
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	991 LuaFunctionCall call(lua_, NAME);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	992 call.PushJson(simplified);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	993
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	994 Json::Value origin;
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	995 instance.GetOrigin().Format(origin);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	996 call.PushJson(origin);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	997
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	998 Json::Value info = Json::objectValue;
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	999 info["HasPixelData"] = instance.HasPixelData();
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1000
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1001 DicomTransferSyntax s;
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1002 if (instance.LookupTransferSyntax(s))
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1003 {
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1004 info["TransferSyntaxUID"] = GetTransferSyntaxUid(s);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1005 }
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1006
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1007 call.PushJson(info);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1008
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1009 int result;
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1010 call.ExecuteToInt(result);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1011 return static_cast<uint16_t>(result);
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1012 }
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1013
4921 309fb4f02704 fix signature of OrthancPluginIncomingCStoreInstanceFilter Sebastien Jodogne <s.jodogne@gmail.com> parents: 4892 diff changeset	1014 return true;
4796 94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1015 }
94616af363ec added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk Alain Mazy <am@osimis.io> parents: 4697 diff changeset	1016
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	1017
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	1018 void LuaScripting::Execute(const std::string& command)
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	1019 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1020 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	1021 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1022
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1023
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1024 void LuaScripting::LoadGlobalConfiguration()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1025 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1026 OrthancConfiguration::ReaderLock configLock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1027
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1028 {
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1029 std::string command;
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1030 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	1031 lua_.Execute(command);
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1032 }
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1033
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1034 std::list<std::string> luaScripts;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1035 configLock.GetConfiguration().GetListOfStringsParameter(luaScripts, "LuaScripts");
5017 0d61efc6256c Added Lua OnHeartBeat() Alain Mazy <am@osimis.io> parents: 4921 diff changeset	1036 heartBeatPeriod_ = configLock.GetConfiguration().GetIntegerParameter("LuaHeartBeatPeriod", 0);
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1037
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1038 LuaScripting::Lock lock(*this);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1039
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1040 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	1041 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	1042 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	1043 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	1044 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	1045 std::string script;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1046 SystemToolbox::ReadFile(script, path);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1047
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	1048 lock.GetLua().Execute(script);
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	1049 }
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	1050 }
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1051
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1052
5410 16cbfefa15e9 Solved a deadlock related to the Job Engine events and plugins Alain Mazy <am@osimis.io> parents: 5185 diff changeset	1053 void LuaScripting::SignalJobEvent(const JobEvent& event)
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1054 {
5410 16cbfefa15e9 Solved a deadlock related to the Job Engine events and plugins Alain Mazy <am@osimis.io> parents: 5185 diff changeset	1055 // Lua has its own event thread and queue to dissociate it completely from the main JobEventsThread
16cbfefa15e9 Solved a deadlock related to the Job Engine events and plugins Alain Mazy <am@osimis.io> parents: 5185 diff changeset	1056 pendingEvents_.Enqueue(new LuaJobEvent(event));
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1057 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1058 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/LuaScripting.cpp @ 5676:b744a2cf408a find-refactoring tip