orthanc: OrthancFramework/Sources/Lua/LuaContext.cpp annotate

annotate OrthancFramework/Sources/Lua/LuaContext.cpp @ 4392:3af1d763763a

confining Json::Reader and Json::*Writer into Toolbox

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 21 Dec 2020 18:09:47 +0100
parents	b30a8de92ad9
children	f7104e9d044c

rev	line source
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
7dec4f3c922c lua wrapper 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: 1658 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1055 diff changeset	4 * Department, University Hospital of Liege, Belgium
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3442 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	8 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	9 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	10 * the License, or (at your option) any later version.
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * This program is distributed in the hope that it will be useful, but
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	15 * Lesser General Public License for more details.
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	17 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	18 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	19 * <http://www.gnu.org/licenses/>.
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 **/
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	23 #include "../PrecompiledHeaders.h"
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "LuaContext.h"
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1465 diff changeset	26 #include "../Logging.h"
1583 9ea3d082b064 got rid of custom exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	27 #include "../OrthancException.h"
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	28 #include "../Toolbox.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1465 diff changeset	29
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	30 #include <set>
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	31 #include <cassert>
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	32 #include <boost/lexical_cast.hpp>
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 extern "C"
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 {
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #include <lualib.h>
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #include <lauxlib.h>
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40 namespace Orthanc
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	42 static bool OnlyContainsDigits(const std::string& s)
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	43 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	44 for (size_t i = 0; i < s.size(); i++)
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	45 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	46 if (!isdigit(s[i]))
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	47 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	48 return false;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	49 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	50 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	51
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	52 return true;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	53 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	54
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	55 LuaContext& LuaContext::GetLuaContext(lua_State *state)
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 {
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	57 const void* value = GetGlobalVariable(state, "_LuaContext");
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	58 assert(value != NULL);
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	59
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	60 return const_cast<LuaContext>(reinterpret_cast<const LuaContext*>(value));
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	61 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	62
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	63 int LuaContext::PrintToLog(lua_State *state)
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	64 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	65 LuaContext& that = GetLuaContext(state);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	66
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 // http://medek.wordpress.com/2009/02/03/wrapping-lua-errors-and-print-function/
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	68 int nArgs = lua_gettop(state);
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	69 lua_getglobal(state, "tostring");
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 // Make sure you start at 1 NOT 0 for arrays in Lua.
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 std::string result;
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 for (int i = 1; i <= nArgs; i++)
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 {
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 const char *s;
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	77 lua_pushvalue(state, -1);
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	78 lua_pushvalue(state, i);
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	79 lua_call(state, 1, 1);
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	80 s = lua_tostring(state, -1);
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 if (result.size() > 0)
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 result.append(", ");
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 if (s == NULL)
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 result.append("<No conversion to string>");
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 else
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88 result.append(s);
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	90 lua_pop(state, 1);
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	93 LOG(WARNING) << "Lua says: " << result;
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	94 that.log_.append(result);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	95 that.log_.append("\n");
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97 return 0;
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	100
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	101 int LuaContext::ParseJson(lua_State *state)
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	102 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	103 LuaContext& that = GetLuaContext(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	104
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	105 int nArgs = lua_gettop(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	106 if (nArgs != 1 \|\|
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	107 !lua_isstring(state, 1)) // Password
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	108 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	109 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	110 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	111 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	112
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	113 const char* str = lua_tostring(state, 1);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	114
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	115 Json::Value value;
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4300 diff changeset	116 if (Toolbox::ReadJson(value, str, strlen(str)))
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	117 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	118 that.PushJson(value);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	119 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	120 else
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	121 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	122 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	123 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	124
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	125 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	126 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	127
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	128
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	129 int LuaContext::DumpJson(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	130 {
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	131 LuaContext& that = GetLuaContext(state);
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	132
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	133 int nArgs = lua_gettop(state);
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	134 if ((nArgs != 1 && nArgs != 2) \|\|
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	135 (nArgs == 2 && !lua_isboolean(state, 2)))
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	136 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	137 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	138 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	139 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	140
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	141 bool keepStrings = false;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	142 if (nArgs == 2)
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	143 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	144 keepStrings = lua_toboolean(state, 2) ? true : false;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	145 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	146
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	147 Json::Value json;
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	148 that.GetJson(json, state, 1, keepStrings);
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	149
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4300 diff changeset	150 std::string s;
3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4300 diff changeset	151 Toolbox::WriteJson(s, json, true /* fast */);
1465 905842836ad4 sample Lua script to write DICOM series to disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 1448 diff changeset	152 lua_pushlstring(state, s.c_str(), s.size());
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	153
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	154 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	155 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	156
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	157
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	158 #if ORTHANC_ENABLE_CURL == 1
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	159 int LuaContext::SetHttpCredentials(lua_State *state)
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	160 {
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	161 LuaContext& that = GetLuaContext(state);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	162
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	163 // Check the types of the arguments
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	164 int nArgs = lua_gettop(state);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	165 if (nArgs != 2 \|\|
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	166 !lua_isstring(state, 1) \|\| // Username
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	167 !lua_isstring(state, 2)) // Password
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	168 {
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	169 LOG(ERROR) << "Lua: Bad parameters to SetHttpCredentials()";
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	170 }
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	171 else
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	172 {
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	173 // Configure the HTTP client
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	174 const char* username = lua_tostring(state, 1);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	175 const char* password = lua_tostring(state, 2);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	176 that.httpClient_.SetCredentials(username, password);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	177 }
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	178
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	179 return 0;
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	180 }
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	181 #endif
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	182
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	183
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	184 #if ORTHANC_ENABLE_CURL == 1
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	185 bool LuaContext::AnswerHttpQuery(lua_State* state)
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	186 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	187 std::string str;
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	188
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	189 try
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	190 {
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	191 httpClient_.Apply(str);
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	192 }
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	193 catch (OrthancException&)
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	194 {
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	195 return false;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	196 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	197
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	198 // Return the result of the HTTP request
1465 905842836ad4 sample Lua script to write DICOM series to disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 1448 diff changeset	199 lua_pushlstring(state, str.c_str(), str.size());
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	200
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	201 return true;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	202 }
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	203 #endif
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	204
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	205
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	206 #if ORTHANC_ENABLE_CURL == 1
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	207 void LuaContext::SetHttpHeaders(int top)
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	208 {
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	209 std::map<std::string, std::string> headers;
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	210 GetDictionaryArgument(headers, lua_, top, false /* keep key case as provided by Lua script */);
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	211
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	212 httpClient_.ClearHeaders(); // always reset headers in case they have been set in a previous request
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	213
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	214 for (std::map<std::string, std::string>::const_iterator
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	215 it = headers.begin(); it != headers.end(); ++it)
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	216 {
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	217 httpClient_.AddHeader(it->first, it->second);
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	218 }
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	219 }
05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	220 #endif
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	221
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	222
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	223 #if ORTHANC_ENABLE_CURL == 1
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	224 int LuaContext::CallHttpGet(lua_State *state)
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	225 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	226 LuaContext& that = GetLuaContext(state);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	227
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	228 // Check the types of the arguments
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	229 int nArgs = lua_gettop(state);
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	230 if (nArgs < 1 \|\| nArgs > 2 \|\| // check args count
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	231 !lua_isstring(state, 1)) // URL is a string
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	232 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	233 LOG(ERROR) << "Lua: Bad parameters to HttpGet()";
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	234 lua_pushnil(state);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	235 return 1;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	236 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	237
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	238 // Configure the HTTP client class
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	239 const char* url = lua_tostring(state, 1);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	240 that.httpClient_.SetMethod(HttpMethod_Get);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	241 that.httpClient_.SetUrl(url);
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	242 that.httpClient_.GetBody().clear();
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	243 that.SetHttpHeaders(2);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	244
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	245 // Do the HTTP GET request
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	246 if (!that.AnswerHttpQuery(state))
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	247 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	248 LOG(ERROR) << "Lua: Error in HttpGet() for URL " << url;
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	249 lua_pushnil(state);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	250 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	251
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	252 return 1;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	253 }
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	254 #endif
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	255
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	256
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	257 #if ORTHANC_ENABLE_CURL == 1
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	258 int LuaContext::CallHttpPostOrPut(lua_State *state,
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	259 HttpMethod method)
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	260 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	261 LuaContext& that = GetLuaContext(state);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	262
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	263 // Check the types of the arguments
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	264 int nArgs = lua_gettop(state);
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	265 if ((nArgs < 1 \|\| nArgs > 3) \|\| // check arg count
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	266 !lua_isstring(state, 1) \|\| // URL is a string
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	267 (nArgs >= 2 && (!lua_isstring(state, 2) && !lua_isnil(state, 2)))) // Body data is null or is a string
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	268 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	269 LOG(ERROR) << "Lua: Bad parameters to HttpPost() or HttpPut()";
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	270 lua_pushnil(state);
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	271 return 1;
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	272 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	273
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	274 // Configure the HTTP client class
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	275 const char* url = lua_tostring(state, 1);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	276 that.httpClient_.SetMethod(method);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	277 that.httpClient_.SetUrl(url);
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	278 that.SetHttpHeaders(3);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	279
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	280 if (nArgs >= 2 && !lua_isnil(state, 2))
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	281 {
2724 c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	282 size_t bodySize = 0;
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	283 const char* bodyData = lua_tolstring(state, 2, &bodySize);
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	284
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	285 if (bodySize == 0)
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	286 {
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	287 that.httpClient_.GetBody().clear();
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	288 }
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	289 else
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	290 {
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	291 that.httpClient_.GetBody().assign(bodyData, bodySize);
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	292 }
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	293 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	294 else
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	295 {
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	296 that.httpClient_.GetBody().clear();
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	297 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	298
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	299 // Do the HTTP POST/PUT request
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	300 if (!that.AnswerHttpQuery(state))
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	301 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	302 LOG(ERROR) << "Lua: Error in HttpPost() or HttpPut() for URL " << url;
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	303 lua_pushnil(state);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	304 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	305
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	306 return 1;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	307 }
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	308 #endif
05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	309
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	310
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	311 #if ORTHANC_ENABLE_CURL == 1
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	312 int LuaContext::CallHttpPost(lua_State *state)
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	313 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	314 return CallHttpPostOrPut(state, HttpMethod_Post);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	315 }
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	316 #endif
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	317
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	318
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	319 #if ORTHANC_ENABLE_CURL == 1
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	320 int LuaContext::CallHttpPut(lua_State *state)
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	321 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	322 return CallHttpPostOrPut(state, HttpMethod_Put);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	323 }
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	324 #endif
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	325
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	326
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	327 #if ORTHANC_ENABLE_CURL == 1
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	328 int LuaContext::CallHttpDelete(lua_State *state)
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	329 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	330 LuaContext& that = GetLuaContext(state);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	331
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	332 // Check the types of the arguments
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	333 int nArgs = lua_gettop(state);
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	334 if (nArgs < 1 \|\| nArgs > 2 \|\| !lua_isstring(state, 1)) // URL
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	335 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	336 LOG(ERROR) << "Lua: Bad parameters to HttpDelete()";
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	337 lua_pushnil(state);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	338 return 1;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	339 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	340
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	341 // Configure the HTTP client class
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	342 const char* url = lua_tostring(state, 1);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	343 that.httpClient_.SetMethod(HttpMethod_Delete);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	344 that.httpClient_.SetUrl(url);
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	345 that.httpClient_.GetBody().clear();
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	346 that.SetHttpHeaders(2);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	347
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	348 // Do the HTTP DELETE request
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	349 std::string s;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	350 if (!that.httpClient_.Apply(s))
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	351 {
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	352 LOG(ERROR) << "Lua: Error in HttpDelete() for URL " << url;
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	353 lua_pushnil(state);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	354 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	355 else
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	356 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	357 lua_pushstring(state, "SUCCESS");
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	358 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	359
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	360 return 1;
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	361 }
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	362 #endif
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	363
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	364
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	365 void LuaContext::PushJson(const Json::Value& value)
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	366 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	367 if (value.isString())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	368 {
1465 905842836ad4 sample Lua script to write DICOM series to disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 1448 diff changeset	369 const std::string s = value.asString();
905842836ad4 sample Lua script to write DICOM series to disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 1448 diff changeset	370 lua_pushlstring(lua_, s.c_str(), s.size());
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	371 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	372 else if (value.isDouble())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	373 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	374 lua_pushnumber(lua_, value.asDouble());
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	375 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	376 else if (value.isInt())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	377 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	378 lua_pushinteger(lua_, value.asInt());
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	379 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	380 else if (value.isUInt())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	381 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	382 lua_pushinteger(lua_, value.asUInt());
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	383 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	384 else if (value.isBool())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	385 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	386 lua_pushboolean(lua_, value.asBool());
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	387 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	388 else if (value.isNull())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	389 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	390 lua_pushnil(lua_);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	391 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	392 else if (value.isArray())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	393 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	394 lua_newtable(lua_);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	395
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	396 // http://lua-users.org/wiki/SimpleLuaApiExample
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	397 for (Json::Value::ArrayIndex i = 0; i < value.size(); i++)
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	398 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	399 // Push the table index (note the "+1" because of Lua conventions)
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	400 lua_pushnumber(lua_, i + 1);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	401
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	402 // Push the value of the cell
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	403 PushJson(value[i]);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	404
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	405 // Stores the pair in the table
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	406 lua_rawset(lua_, -3);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	407 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	408 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	409 else if (value.isObject())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	410 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	411 lua_newtable(lua_);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	412
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	413 Json::Value::Members members = value.getMemberNames();
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	414
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	415 for (Json::Value::Members::const_iterator
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	416 it = members.begin(); it != members.end(); ++it)
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	417 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	418 // Push the index of the cell
1465 905842836ad4 sample Lua script to write DICOM series to disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 1448 diff changeset	419 lua_pushlstring(lua_, it->c_str(), it->size());
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	420
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	421 // Push the value of the cell
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	422 PushJson(value[*it]);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	423
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	424 // Stores the pair in the table
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	425 lua_rawset(lua_, -3);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	426 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	427 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	428 else
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	429 {
1583 9ea3d082b064 got rid of custom exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	430 throw OrthancException(ErrorCode_JsonToLuaTable);
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	431 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	432 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	433
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	435 void LuaContext::GetJson(Json::Value& result,
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	436 lua_State* state,
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	437 int top,
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	438 bool keepStrings)
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	439 {
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	440 if (lua_istable(state, top))
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	441 {
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	442 Json::Value tmp = Json::objectValue;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	443 bool isArray = true;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	444 size_t size = 0;
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	445
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	446 // Code adapted from: http://stackoverflow.com/a/6142700/881731
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	447
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	448 // Push another reference to the table on top of the stack (so we know
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	449 // where it is, and this function can work for negative, positive and
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	450 // pseudo indices
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	451 lua_pushvalue(state, top);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	452 // stack now contains: -1 => table
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	453 lua_pushnil(state);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	454 // stack now contains: -1 => nil; -2 => table
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	455 while (lua_next(state, -2))
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	456 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	457 // stack now contains: -1 => value; -2 => key; -3 => table
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	458 // copy the key so that lua_tostring does not modify the original
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	459 lua_pushvalue(state, -2);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	460 // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	461 std::string key(lua_tostring(state, -1));
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	462 Json::Value v;
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	463 GetJson(v, state, -2, keepStrings);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	464
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	465 tmp[key] = v;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	466
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	467 size += 1;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	468 try
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	469 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	470 if (!OnlyContainsDigits(key) \|\|
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	471 boost::lexical_cast<size_t>(key) != size)
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	472 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	473 isArray = false;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	474 }
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	475 }
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	476 catch (boost::bad_lexical_cast&)
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	477 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	478 isArray = false;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	479 }
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	480
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	481 // pop value + copy of key, leaving original key
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	482 lua_pop(state, 2);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	483 // stack now contains: -1 => key; -2 => table
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	484 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	485 // stack now contains: -1 => table (when lua_next returns 0 it pops the key
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	486 // but does not push anything.)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	487 // Pop table
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	488 lua_pop(state, 1);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	489
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	490 // Stack is now the same as it was on entry to this function
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	491
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	492 if (isArray)
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	493 {
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	494 result = Json::arrayValue;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	495 for (size_t i = 0; i < size; i++)
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	496 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	497 result.append(tmp[boost::lexical_cast<std::string>(i + 1)]);
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	498 }
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	499 }
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	500 else
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	501 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	502 result = tmp;
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	503 }
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	504 }
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	505 else if (lua_isnil(state, top))
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	506 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	507 result = Json::nullValue;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	508 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	509 else if (!keepStrings &&
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	510 lua_isboolean(state, top))
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	511 {
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	512 result = lua_toboolean(state, top) ? true : false;
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	513 }
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	514 else if (!keepStrings &&
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	515 lua_isnumber(state, top))
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	516 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	517 // Convert to "int" if truncation does not loose precision
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	518 double value = static_cast<double>(lua_tonumber(state, top));
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	519 int truncated = static_cast<int>(value);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	520
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	521 if (std::abs(value - static_cast<double>(truncated)) <=
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	522 std::numeric_limits<double>::epsilon())
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	523 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	524 result = truncated;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	525 }
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	526 else
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	527 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	528 result = value;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	529 }
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	530 }
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	531 else if (lua_isstring(state, top))
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	532 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	533 // Caution: The "lua_isstring()" case must be the last, since
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	534 // Lua can convert most types to strings by default.
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	535 result = std::string(lua_tostring(state, top));
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	536 }
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	537 else if (lua_isboolean(state, top))
2220 0fb6e0461105 fix handling of Booleans in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	538 {
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	539 result = lua_toboolean(state, top) ? true : false;
2220 0fb6e0461105 fix handling of Booleans in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	540 }
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	541 else
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	542 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	543 LOG(WARNING) << "Unsupported Lua type when returning Json";
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	544 result = Json::nullValue;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	545 }
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	546 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	547
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	548
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	549 LuaContext::LuaContext()
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	550 {
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551 lua_ = luaL_newstate();
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552 if (!lua_)
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	553 {
1583 9ea3d082b064 got rid of custom exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	554 throw OrthancException(ErrorCode_CannotCreateLua);
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	557 luaL_openlibs(lua_);
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558 lua_register(lua_, "print", PrintToLog);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	559 lua_register(lua_, "ParseJson", ParseJson);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	560 lua_register(lua_, "DumpJson", DumpJson);
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	561
05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	562 #if ORTHANC_ENABLE_CURL == 1
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	563 lua_register(lua_, "HttpGet", CallHttpGet);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	564 lua_register(lua_, "HttpPost", CallHttpPost);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	565 lua_register(lua_, "HttpPut", CallHttpPut);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	566 lua_register(lua_, "HttpDelete", CallHttpDelete);
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	567 lua_register(lua_, "SetHttpCredentials", SetHttpCredentials);
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	568 #endif
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	569
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	570 SetGlobalVariable("_LuaContext", this);
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	571 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	572
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	573
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574 LuaContext::~LuaContext()
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	575 {
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	576 lua_close(lua_);
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	577 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	578
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	579
4300 b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	580 void LuaContext::Execute(const std::string &command)
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	581 {
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	582 ExecuteInternal(NULL, command);
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	583 }
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	584
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	585 void LuaContext::Execute(std::string &output, const std::string &command)
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	586 {
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	587 ExecuteInternal(&output, command);
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	588 }
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	589
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	590
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	591 void LuaContext::ExecuteInternal(std::string* output,
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	592 const std::string& command)
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 {
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	594 log_.clear();
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595 int error = (luaL_loadbuffer(lua_, command.c_str(), command.size(), "line") \|\|
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	596 lua_pcall(lua_, 0, 0, 0));
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	598 if (error)
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	599 {
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	600 assert(lua_gettop(lua_) >= 1);
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	602 std::string description(lua_tostring(lua_, -1));
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 lua_pop(lua_, 1); /* pop error message from the stack */
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2724 diff changeset	604 throw OrthancException(ErrorCode_CannotExecuteLua, description);
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	605 }
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	606
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	607 if (output != NULL)
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	608 {
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	609 *output = log_;
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	610 }
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	613
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	614 bool LuaContext::IsExistingFunction(const char* name)
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	615 {
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	616 lua_settop(lua_, 0);
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	617 lua_getglobal(lua_, name);
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	618 return lua_type(lua_, -1) == LUA_TFUNCTION;
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	619 }
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	620
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	621
4300 b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	622 #if ORTHANC_ENABLE_CURL == 1
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	623 void LuaContext::SetHttpCredentials(const char* username,
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	624 const char* password)
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	625 {
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	626 httpClient_.SetCredentials(username, password);
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	627 }
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	628 #endif
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	629
b30a8de92ad9 abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	630
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	631 void LuaContext::Execute(Json::Value& output,
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	632 const std::string& command)
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	633 {
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	634 std::string s;
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	635 ExecuteInternal(&s, command);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	636
4392 3af1d763763a confining Json::Reader and Json::Writer into Toolbox Sebastien Jodogne <s.jodogne@gmail.com>* parents: 4300 diff changeset	637 if (!Toolbox::ReadJson(output, s))
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	638 {
1596 f2e3d030ea59 BadJson error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	639 throw OrthancException(ErrorCode_BadJson);
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	640 }
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	641 }
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	642
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	643
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	644 void LuaContext::RegisterFunction(const char* name,
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	645 lua_CFunction func)
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	646 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	647 lua_register(lua_, name, func);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	648 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	649
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	650
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	651 void LuaContext::SetGlobalVariable(const char* name,
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	652 void* value)
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	653 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	654 lua_pushlightuserdata(lua_, value);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	655 lua_setglobal(lua_, name);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	656 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	657
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	658
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	659 const void* LuaContext::GetGlobalVariable(lua_State* state,
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	660 const char* name)
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	661 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	662 lua_getglobal(state, name);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	663 assert(lua_type(state, -1) == LUA_TLIGHTUSERDATA);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	664 const void* value = lua_topointer(state, -1);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	665 lua_pop(state, 1);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	666 return value;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	667 }
3442 dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	668
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	669
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	670 void LuaContext::GetDictionaryArgument(std::map<std::string, std::string>& target,
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	671 lua_State* state,
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	672 int top,
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	673 bool keyToLowerCase)
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	674 {
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	675 target.clear();
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	676
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	677 if (lua_gettop(state) >= top)
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	678 {
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	679 Json::Value headers;
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	680 GetJson(headers, state, top, true);
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	681
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	682 Json::Value::Members members = headers.getMemberNames();
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	683
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	684 for (size_t i = 0; i < members.size(); i++)
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	685 {
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	686 std::string key = members[i];
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	687
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	688 if (keyToLowerCase)
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	689 {
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	690 Toolbox::ToLowerCase(key);
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	691 }
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	692
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	693 target[key] = headers[members[i]].asString();
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	694 }
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	695 }
dd1e68f2d0c0 Fix issue #106 (Unable to export preview as jpeg from Lua script) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	696 }
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	697 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/Lua/LuaContext.cpp @ 4392:3af1d763763a