orthanc: OrthancServer/Sources/LuaScripting.cpp annotate

annotate OrthancServer/Sources/LuaScripting.cpp @ 4796:94616af363ec filter-store-instance

added ReceivedCStoreInstanceFilter lua callback + OrthancPluginRegisterIncomingCStoreInstanceFilter in sdk

author	Alain Mazy <am@osimis.io>
date	Fri, 01 Oct 2021 18:36:45 +0200
parents	569d9ef165b1
children	70d2a97ca8cb 7053502fbf97

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

Mercurial > hg > orthanc

annotate OrthancServer/Sources/LuaScripting.cpp @ 4796:94616af363ec filter-store-instance