orthanc: OrthancServer/LuaScripting.cpp annotate

annotate OrthancServer/LuaScripting.cpp @ 2944:f395460af74d

simplifying OrthancConfiguration for modalities/peers

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 29 Nov 2018 16:31:20 +0100
parents	4767d36679ed
children	bbfd95a0c429

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
2447 878b59270859 upgrade to year 2018 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	5 * Copyright (C) 2017-2018 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
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	41 #include "../Core/HttpServer/StringHttpOutput.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1465 diff changeset	42 #include "../Core/Logging.h"
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	43 #include "../Core/Lua/LuaFunctionCall.h"
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 #include <EmbeddedResources.h>
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 namespace Orthanc
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	50 class LuaScripting::IEvent : public IDynamicObject
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	51 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	52 public:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	53 virtual void Apply(LuaScripting& lock) = 0;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	54 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	55
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	56
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	57 class LuaScripting::OnStoredInstanceEvent : public LuaScripting::IEvent
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	58 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	59 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	60 std::string instanceId_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	61 Json::Value simplifiedTags_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	62 Json::Value metadata_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	63 Json::Value origin_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	64
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	65 public:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	66 OnStoredInstanceEvent(const std::string& instanceId,
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	67 const Json::Value& simplifiedTags,
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	68 const Json::Value& metadata,
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	69 const DicomInstanceToStore& instance) :
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	70 instanceId_(instanceId),
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	71 simplifiedTags_(simplifiedTags),
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	72 metadata_(metadata)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	73 {
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2638 diff changeset	74 instance.GetOrigin().Format(origin_);
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	75 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	76
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	77 virtual void Apply(LuaScripting& that)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	78 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	79 static const char* NAME = "OnStoredInstance";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	80
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	81 LuaScripting::Lock lock(that);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	82
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	83 if (lock.GetLua().IsExistingFunction(NAME))
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	84 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	85 that.InitializeJob();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	86
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	87 LuaFunctionCall call(lock.GetLua(), NAME);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	88 call.PushString(instanceId_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	89 call.PushJson(simplifiedTags_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	90 call.PushJson(metadata_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	91 call.PushJson(origin_);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	92 call.Execute();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	93
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	94 that.SubmitJob();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	95 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	96 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	97 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	98
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	99
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	100 class LuaScripting::ExecuteEvent : public LuaScripting::IEvent
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	101 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	102 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	103 std::string command_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	104
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	105 public:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	106 ExecuteEvent(const std::string& command) :
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	107 command_(command)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	108 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	109 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	110
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	111 virtual void Apply(LuaScripting& that)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	112 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	113 LuaScripting::Lock lock(that);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	114
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	115 if (lock.GetLua().IsExistingFunction(command_.c_str()))
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	116 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	117 LuaFunctionCall call(lock.GetLua(), command_.c_str());
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	118 call.Execute();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	119 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	120 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	121 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	122
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	123
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	124 class LuaScripting::StableResourceEvent : public LuaScripting::IEvent
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	125 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	126 private:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	127 ServerIndexChange change_;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	128
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	129 public:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	130 StableResourceEvent(const ServerIndexChange& change) :
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	131 change_(change)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	132 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	133 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	134
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	135 virtual void Apply(LuaScripting& that)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	136 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	137 const char* name;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	138
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	139 switch (change_.GetChangeType())
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	140 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	141 case ChangeType_StablePatient:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	142 name = "OnStablePatient";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	143 break;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	144
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	145 case ChangeType_StableStudy:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	146 name = "OnStableStudy";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	147 break;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	148
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	149 case ChangeType_StableSeries:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	150 name = "OnStableSeries";
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	151 break;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	152
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	153 default:
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	154 throw OrthancException(ErrorCode_InternalError);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	155 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	156
2638 25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	157 {
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	158 // Avoid unnecessary calls to the database if there's no Lua callback
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	159 LuaScripting::Lock lock(that);
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	160
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	161 if (!lock.GetLua().IsExistingFunction(name))
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	162 {
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	163 return;
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	164 }
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	165 }
25ae209dcea9 Avoid unnecessary calls to the database if there is no Lua callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 2620 diff changeset	166
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	167 Json::Value tags, metadata;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	168 if (that.context_.GetIndex().LookupResource(tags, change_.GetPublicId(), change_.GetResourceType()) &&
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	169 that.context_.GetIndex().GetMetadata(metadata, change_.GetPublicId()))
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	170 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	171 LuaScripting::Lock lock(that);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	172
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	173 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	174 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	175 that.InitializeJob();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	176
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	177 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	178 call.PushString(change_.GetPublicId());
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	179 call.PushJson(tags["MainDicomTags"]);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	180 call.PushJson(metadata);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	181 call.Execute();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	182
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	183 that.SubmitJob();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	184 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	185 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	186 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	187 };
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	188
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	189
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	190 class LuaScripting::JobEvent : public LuaScripting::IEvent
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	191 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	192 public:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	193 enum Type
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	194 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	195 Type_Failure,
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	196 Type_Submitted,
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	197 Type_Success
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	198 };
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	199
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	200 private:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	201 Type type_;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	202 std::string jobId_;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	203
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	204 public:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	205 JobEvent(Type type,
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	206 const std::string& jobId) :
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	207 type_(type),
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	208 jobId_(jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	209 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	210 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	211
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	212 virtual void Apply(LuaScripting& that)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	213 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	214 std::string functionName;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	215
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	216 switch (type_)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	217 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	218 case Type_Failure:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	219 functionName = "OnJobFailure";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	220 break;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	221
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	222 case Type_Submitted:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	223 functionName = "OnJobSubmitted";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	224 break;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	225
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	226 case Type_Success:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	227 functionName = "OnJobSuccess";
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	228 break;
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	229
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	230 default:
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	231 throw OrthancException(ErrorCode_InternalError);
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	232 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	233
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	234 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	235 LuaScripting::Lock lock(that);
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	236
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	237 if (lock.GetLua().IsExistingFunction(functionName.c_str()))
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	238 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	239 LuaFunctionCall call(lock.GetLua(), functionName.c_str());
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	240 call.PushString(jobId_);
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	241 call.Execute();
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	242 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	243 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	244 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	245 };
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	246
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	247
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	248 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	249 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	250 const void* value = LuaContext::GetGlobalVariable(state, "_ServerContext");
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	251 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	252 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	253
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	254
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	255 // Syntax in Lua: RestApiGet(uri, builtin)
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	256 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	257 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	258 ServerContext* serverContext = GetServerContext(state);
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	259 if (serverContext == NULL)
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	260 {
1440 3567503c00a7 lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	261 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	262 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	263 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	264 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	265
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	266 // Check the types of the arguments
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	267 int nArgs = lua_gettop(state);
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	268 if ((nArgs != 1 && nArgs != 2) \|\|
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	269 !lua_isstring(state, 1) \|\| // URI
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	270 (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	271 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	272 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	273 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	274 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	275 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	276
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	277 const char* uri = lua_tostring(state, 1);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	278 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	279
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	280 try
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	281 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	282 std::string result;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	283 if (HttpToolbox::SimpleGet(result, serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	284 RequestOrigin_Lua, uri))
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	285 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	286 lua_pushlstring(state, result.c_str(), result.size());
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	287 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	288 }
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	289 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	290 catch (OrthancException& e)
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	291 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	292 LOG(ERROR) << "Lua: " << e.What();
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	293 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	294
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	295 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	296 lua_pushnil(state);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	297 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	298 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	299
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	300
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	301 int LuaScripting::RestApiPostOrPut(lua_State *state,
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	302 bool isPost)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	303 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	304 ServerContext* serverContext = GetServerContext(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	305 if (serverContext == NULL)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	306 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	307 LOG(ERROR) << "Lua: The Orthanc API is unavailable";
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	308 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	309 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	310 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	311
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	312 // Check the types of the arguments
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	313 int nArgs = lua_gettop(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	314 if ((nArgs != 2 && nArgs != 3) \|\|
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	315 !lua_isstring(state, 1) \|\| // URI
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	316 !lua_isstring(state, 2) \|\| // Body
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	317 (nArgs == 3 && !lua_isboolean(state, 3))) // Restrict to built-in API?
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	318 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	319 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	320 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	321 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	322 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	323
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	324 const char* uri = lua_tostring(state, 1);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	325 size_t bodySize = 0;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	326 const char* bodyData = lua_tolstring(state, 2, &bodySize);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	327 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	328
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	329 try
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	330 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	331 std::string result;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	332 if (isPost ?
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	333 HttpToolbox::SimplePost(result, serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	334 RequestOrigin_Lua, uri, bodyData, bodySize) :
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	335 HttpToolbox::SimplePut(result, serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	336 RequestOrigin_Lua, uri, bodyData, bodySize))
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	337 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	338 lua_pushlstring(state, result.c_str(), result.size());
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	339 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	340 }
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	341 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	342 catch (OrthancException& e)
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	343 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	344 LOG(ERROR) << "Lua: " << e.What();
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	345 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	346
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	347 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	348 lua_pushnil(state);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	349 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	350 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	351
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	352
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	353 // Syntax in Lua: RestApiPost(uri, body, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	354 int LuaScripting::RestApiPost(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	355 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	356 return RestApiPostOrPut(state, true);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	357 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	358
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	359
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	360 // Syntax in Lua: RestApiPut(uri, body, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	361 int LuaScripting::RestApiPut(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	362 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	363 return RestApiPostOrPut(state, false);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	364 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	365
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	366
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	367 // Syntax in Lua: RestApiDelete(uri, builtin)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	368 int LuaScripting::RestApiDelete(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	369 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	370 ServerContext* serverContext = GetServerContext(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	371 if (serverContext == NULL)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	372 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	373 LOG(ERROR) << "Lua: The Orthanc API is unavailable";
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	374 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	375 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	376 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	377
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	378 // Check the types of the arguments
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	379 int nArgs = lua_gettop(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	380 if ((nArgs != 1 && nArgs != 2) \|\|
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	381 !lua_isstring(state, 1) \|\| // URI
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	382 (nArgs == 2 && !lua_isboolean(state, 2))) // Restrict to built-in API?
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	383 {
1449 164a381abb2b NEWS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	384 LOG(ERROR) << "Lua: Bad parameters to RestApiDelete()";
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	385 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	386 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	387 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	388
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	389 const char* uri = lua_tostring(state, 1);
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	390 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	391
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	392 try
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	393 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	394 if (HttpToolbox::SimpleDelete(serverContext->GetHttpHandler().RestrictToOrthancRestApi(builtin),
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	395 RequestOrigin_Lua, uri))
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	396 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	397 lua_pushboolean(state, 1);
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	398 return 1;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	399 }
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	400 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	401 catch (OrthancException& e)
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	402 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	403 LOG(ERROR) << "Lua: " << e.What();
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	404 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	405
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	406 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	407 lua_pushnil(state);
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	408
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	409 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	410 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	411
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	412
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	413 // Syntax in Lua: GetOrthancConfiguration()
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	414 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	415 {
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	416 Json::Value configuration;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	417
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	418 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	419 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	420 configuration = lock.GetJson();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	421 }
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	422
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	423 LuaContext::GetLuaContext(state).PushJson(configuration);
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	424
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	425 return 1;
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	426 }
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	427
d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	428
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	429 size_t LuaScripting::ParseOperation(LuaJobManager::Lock& lock,
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	430 const std::string& operation,
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	431 const Json::Value& parameters)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433 if (operation == "delete")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	435 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	436 return lock.AddDeleteResourceOperation(context_);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	437 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	439 if (operation == "store-scu")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 std::string localAet;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	442 if (parameters.isMember("LocalAet"))
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	443 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444 localAet = parameters["LocalAet"].asString();
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 else
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448 localAet = context_.GetDefaultLocalApplicationEntityTitle();
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	451 std::string name = parameters["Modality"].asString();
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	452 RemoteModalityParameters modality;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	453
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	454 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	455 OrthancConfiguration::ReaderLock configLock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	456 modality = configLock.GetConfiguration().GetModalityUsingSymbolicName(name);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	457 }
2222 21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	458
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 2020 diff changeset	459 // This is not a C-MOVE: No need to call "StoreScuCommand::SetMoveOriginator()"
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	460 return lock.AddStoreScuOperation(localAet, modality);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 if (operation == "store-peer")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	465 OrthancConfiguration::ReaderLock configLock;
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	466 std::string name = parameters["Peer"].asString();
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	467
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	468 WebServiceParameters peer;
2944 f395460af74d simplifying OrthancConfiguration for modalities/peers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	469 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	470 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	471 return lock.AddStorePeerOperation(peer);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	472 }
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	473 else
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	474 {
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	475 LOG(ERROR) << "No peer with symbolic name: " << name;
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	476 throw OrthancException(ErrorCode_UnknownResource);
6e3a60b85da6 New primitives to access Orthanc peers from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2738 diff changeset	477 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480 if (operation == "modify")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 {
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1658 diff changeset	482 std::auto_ptr<DicomModification> modification(new DicomModification);
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	483 modification->ParseModifyRequest(parameters);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	485 return lock.AddModifyInstanceOperation(context_, modification.release());
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	486 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	487
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488 if (operation == "call-system")
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	490 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	491
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	492 const Json::Value& argsIn = parameters["Arguments"];
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	493 if (argsIn.type() != Json::arrayValue)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	494 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495 throw OrthancException(ErrorCode_BadParameterType);
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	496 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 std::vector<std::string> args;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499 args.reserve(argsIn.size());
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 for (Json::Value::ArrayIndex i = 0; i < argsIn.size(); ++i)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	502 // http://jsoncpp.sourceforge.net/namespace_json.html#7d654b75c16a57007925868e38212b4e
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	503 switch (argsIn[i].type())
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	504 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505 case Json::stringValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506 args.push_back(argsIn[i].asString());
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	507 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	508
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	509 case Json::intValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	510 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asInt()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	511 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	512
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513 case Json::uintValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asUInt()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	515 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	517 case Json::realValue:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	518 args.push_back(boost::lexical_cast<std::string>(argsIn[i].asFloat()));
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	519 break;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	521 default:
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	522 throw OrthancException(ErrorCode_BadParameterType);
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	523 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	525
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	526 std::string command = parameters["Command"].asString();
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	527 std::vector<std::string> postArgs;
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	528
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	529 return lock.AddSystemCallOperation(command, args, postArgs);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	530 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	531
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	532 throw OrthancException(ErrorCode_ParameterOutOfRange);
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	533 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	535
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	536 void LuaScripting::InitializeJob()
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	537 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	538 lua_.Execute("_InitializeJob()");
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	539 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	540
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	541
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	542 void LuaScripting::SubmitJob()
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	543 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	544 Json::Value operations;
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	545 LuaFunctionCall call2(lua_, "_AccessJob");
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	546 call2.ExecuteToJson(operations, false);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	547
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	548 if (operations.type() != Json::arrayValue)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	549 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	550 throw OrthancException(ErrorCode_InternalError);
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	551 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	552
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	553 LuaJobManager::Lock lock(jobManager_, context_.GetJobsEngine());
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	554
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	555 bool isFirst = true;
2727 815e30657dad fix warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 2675 diff changeset	556 size_t previous = 0; // Dummy initialization to avoid warning
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	557
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	558 for (Json::Value::ArrayIndex i = 0; i < operations.size(); ++i)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	559 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	560 if (operations[i].type() != Json::objectValue \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	561 !operations[i].isMember("Operation"))
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	562 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	563 throw OrthancException(ErrorCode_InternalError);
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	564 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	565
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	566 const Json::Value& parameters = operations[i];
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	567 if (!parameters.isMember("Resource"))
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	568 {
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	569 throw OrthancException(ErrorCode_InternalError);
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	570 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	571
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	572 std::string operation = parameters["Operation"].asString();
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	573 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	574
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	575 std::string resource = parameters["Resource"].asString();
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	576 if (!resource.empty())
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	577 {
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	578 lock.AddDicomInstanceInput(index, context_, resource);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	579 }
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	580 else if (!isFirst)
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	581 {
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	582 lock.Connect(previous, index);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	583 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	584
2609 f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	585 isFirst = false;
f7a84b551ee4 switch Lua to new jobs engine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2519 diff changeset	586 previous = index;
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	587 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	588 }
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	589
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	590
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	591 LuaScripting::LuaScripting(ServerContext& context) :
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	592 context_(context),
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	593 state_(State_Setup)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 {
1444 b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	595 lua_.SetGlobalVariable("_ServerContext", &context);
b2b09a3dbd8e refactoring: OrthancHttpHandler inside OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	596 lua_.RegisterFunction("RestApiGet", RestApiGet);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	597 lua_.RegisterFunction("RestApiPost", RestApiPost);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	598 lua_.RegisterFunction("RestApiPut", RestApiPut);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1445 diff changeset	599 lua_.RegisterFunction("RestApiDelete", RestApiDelete);
1587 d7e569640d09 New function "GetOrthancConfiguration()" to get the Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1574 diff changeset	600 lua_.RegisterFunction("GetOrthancConfiguration", GetOrthancConfiguration);
2738 3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	601
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	602 LOG(INFO) << "Initializing Lua for the event handler";
3a55b77339ff fix deadlock in Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 2727 diff changeset	603 LoadGlobalConfiguration();
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	604 }
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	605
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	606
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	607 LuaScripting::~LuaScripting()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	608 {
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	609 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	610 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	611 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	612 Stop();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	613 }
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
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	617 void LuaScripting::EventThread(LuaScripting* that)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	618 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	619 for (;;)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	620 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	621 std::auto_ptr<IDynamicObject> event(that->pendingEvents_.Dequeue(100));
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	622
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	623 if (event.get() == NULL)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	624 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	625 // The event queue is empty, check whether we should stop
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	626 boost::recursive_mutex::scoped_lock lock(that->mutex_);
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	627
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	628 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	629 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	630 return;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	631 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	632 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	633 else
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	634 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	635 try
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	636 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	637 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	638 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	639 catch (OrthancException& e)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	640 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	641 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	642 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	643 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	644 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	645 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	646
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	648 void LuaScripting::Start()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	649 {
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	650 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	651
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	652 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	653 eventThread_.joinable() /* already started */)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	654 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	655 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	656 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	657 else
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	658 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	659 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	660 eventThread_ = boost::thread(EventThread, this);
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	661 state_ = State_Running;
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	662 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	663 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	664
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1571 diff changeset	665
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	666 void LuaScripting::Stop()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	667 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	668 {
2618 ef5b45884972 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	669 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	670
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	671 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	672 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	673 throw OrthancException(ErrorCode_BadSequenceOfCalls);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	674 }
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1571 diff changeset	675
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2649 diff changeset	676 state_ = State_Done;
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	677 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	678
2620 1232922c8793 speeding up shutdown if Lua script is in trailing phase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2618 diff changeset	679 jobManager_.AwakeTrailingSleep();
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	680
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	681 if (eventThread_.joinable())
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	682 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	683 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	684 eventThread_.join();
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	685 LOG(INFO) << "The Lua engine has stopped";
1433 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 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	688
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	689
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	690 void LuaScripting::SignalStoredInstance(const std::string& publicId,
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	691 DicomInstanceToStore& instance,
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 const Json::Value& simplifiedTags)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	693 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	694 Json::Value metadata = Json::objectValue;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	695
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	696 for (ServerIndex::MetadataMap::const_iterator
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	697 it = instance.GetMetadata().begin();
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	698 it != instance.GetMetadata().end(); ++it)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	699 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	700 if (it->first.first == ResourceType_Instance)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	701 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	702 metadata[EnumerationToString(it->first.second)] = it->second;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	703 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	704 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	705
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	706 pendingEvents_.Enqueue(new OnStoredInstanceEvent(publicId, simplifiedTags, metadata, instance));
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	707 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	708
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	709
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	710 void LuaScripting::SignalChange(const ServerIndexChange& change)
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	711 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	712 if (change.GetChangeType() == ChangeType_StablePatient \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	713 change.GetChangeType() == ChangeType_StableStudy \|\|
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	714 change.GetChangeType() == ChangeType_StableSeries)
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	715 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	716 pendingEvents_.Enqueue(new StableResourceEvent(change));
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	717 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	718 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	719
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	720
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	721 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	722 const Json::Value& simplified)
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	723 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	724 static const char* NAME = "ReceivedInstanceFilter";
6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	725
1456 68827c07e683 fix recursive calls with Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	726 boost::recursive_mutex::scoped_lock lock(mutex_);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	728 if (lua_.IsExistingFunction(NAME))
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	729 {
1435 6406f5493d92 refactoring: Lua toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	730 LuaFunctionCall call(lua_, NAME);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	731 call.PushJson(simplified);
1574 0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	732
0c29ebe80ac9 give access to full request origin in ReceivedInstanceFilter (Lua) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	733 Json::Value origin;
2640 c691fcf66071 ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2638 diff changeset	734 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	735 call.PushJson(origin);
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	737 if (!call.ExecutePredicate())
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738 {
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739 return false;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	741 }
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	743 return true;
461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	744 }
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	745
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	746
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	747 void LuaScripting::Execute(const std::string& command)
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	748 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	749 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	750 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	751
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	752
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	753 void LuaScripting::LoadGlobalConfiguration()
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	754 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	755 OrthancConfiguration::ReaderLock configLock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	756
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	757 lua_.Execute(Orthanc::EmbeddedResources::LUA_TOOLBOX);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	758
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	759 std::list<std::string> luaScripts;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	760 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	761
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	762 LuaScripting::Lock lock(*this);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	763
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	764 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	765 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	766 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2799 diff changeset	767 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	768 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	769 std::string script;
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	770 SystemToolbox::ReadFile(script, path);
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	771
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2609 diff changeset	772 lock.GetLua().Execute(script);
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	773 }
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1449 diff changeset	774 }
2675 3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	775
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	776
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	777 void LuaScripting::SignalJobSubmitted(const std::string& jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	778 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	779 pendingEvents_.Enqueue(new JobEvent(JobEvent::Type_Submitted, jobId));
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	780 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	781
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	782
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	783 void LuaScripting::SignalJobSuccess(const std::string& jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	784 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	785 pendingEvents_.Enqueue(new JobEvent(JobEvent::Type_Success, jobId));
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	786 }
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	787
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	788
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	789 void LuaScripting::SignalJobFailure(const std::string& jobId)
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	790 {
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	791 pendingEvents_.Enqueue(new JobEvent(JobEvent::Type_Failure, jobId));
3fc310ceb6d4 lua callbacks for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	792 }
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	793 }

Mercurial > hg > orthanc

annotate OrthancServer/LuaScripting.cpp @ 2944:f395460af74d