orthanc: Core/Lua/LuaContext.cpp annotate

annotate Core/Lua/LuaContext.cpp @ 3346:f509d3c6d570

increasing default value of QueryRetrieveSize to 100

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 09 Apr 2019 08:26:29 +0200
parents	4e43e67f8ecf
children	dd1e68f2d0c0

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
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	5 * Copyright (C) 2017-2019 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
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
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 * In addition, as a special exception, the copyright holders of this
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * 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	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	34 #include "../PrecompiledHeaders.h"
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "LuaContext.h"
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1465 diff changeset	37 #include "../Logging.h"
1583 9ea3d082b064 got rid of custom exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	38 #include "../OrthancException.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1465 diff changeset	39
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	40 #include <set>
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	41 #include <cassert>
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	42 #include <boost/lexical_cast.hpp>
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 extern "C"
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 {
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 #include <lualib.h>
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 #include <lauxlib.h>
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 namespace Orthanc
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 {
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	52 static bool OnlyContainsDigits(const std::string& s)
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 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	55 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	56 if (!isdigit(s[i]))
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	57 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	58 return false;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	59 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	60 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	61
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	62 return true;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	63 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	64
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	65 LuaContext& LuaContext::GetLuaContext(lua_State *state)
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 {
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	67 const void* value = GetGlobalVariable(state, "_LuaContext");
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	68 assert(value != NULL);
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	69
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	70 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	71 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	72
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	73 int LuaContext::PrintToLog(lua_State *state)
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	74 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	75 LuaContext& that = GetLuaContext(state);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	76
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 // 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	78 int nArgs = lua_gettop(state);
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	79 lua_getglobal(state, "tostring");
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 // Make sure you start at 1 NOT 0 for arrays in Lua.
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 std::string result;
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84 for (int i = 1; i <= nArgs; i++)
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 {
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 const char *s;
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	87 lua_pushvalue(state, -1);
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	88 lua_pushvalue(state, i);
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	89 lua_call(state, 1, 1);
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	90 s = lua_tostring(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 if (result.size() > 0)
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 result.append(", ");
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 if (s == NULL)
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96 result.append("<No conversion to string>");
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97 else
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 result.append(s);
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	100 lua_pop(state, 1);
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	103 LOG(WARNING) << "Lua says: " << result;
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	104 that.log_.append(result);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	105 that.log_.append("\n");
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107 return 0;
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	110
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	111 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	112 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	113 LuaContext& that = GetLuaContext(state);
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 int nArgs = lua_gettop(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	116 if (nArgs != 1 \|\|
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	117 !lua_isstring(state, 1)) // Password
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	118 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	119 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	120 return 1;
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
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	123 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	124
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	125 Json::Value value;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	126 Json::Reader reader;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	127 if (reader.parse(str, str + strlen(str), value))
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	128 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	129 that.PushJson(value);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	130 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	131 else
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	132 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	133 lua_pushnil(state);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	134 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	135
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	136 return 1;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	137 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	138
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	139
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	140 int LuaContext::DumpJson(lua_State *state)
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	141 {
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	142 LuaContext& that = GetLuaContext(state);
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	143
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	144 int nArgs = lua_gettop(state);
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	145 if ((nArgs != 1 && nArgs != 2) \|\|
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	146 (nArgs == 2 && !lua_isboolean(state, 2)))
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	147 {
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	148 lua_pushnil(state);
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	149 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	150 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	151
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	152 bool keepStrings = false;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	153 if (nArgs == 2)
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	154 {
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	155 keepStrings = lua_toboolean(state, 2) ? true : false;
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	156 }
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	157
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	158 Json::Value json;
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	159 that.GetJson(json, 1, keepStrings);
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	160
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	161 Json::FastWriter writer;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	162 std::string s = writer.write(json);
1465 905842836ad4 sample Lua script to write DICOM series to disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 1448 diff changeset	163 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	164
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	165 return 1;
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	166 }
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	167
5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	168
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	169 int LuaContext::SetHttpCredentials(lua_State *state)
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 LuaContext& that = GetLuaContext(state);
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 // Check the types of the arguments
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	174 int nArgs = lua_gettop(state);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	175 if (nArgs != 2 \|\|
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	176 !lua_isstring(state, 1) \|\| // Username
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	177 !lua_isstring(state, 2)) // Password
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 LOG(ERROR) << "Lua: Bad parameters to SetHttpCredentials()";
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	180 }
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	181 else
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 // Configure the HTTP client
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	184 const char* username = lua_tostring(state, 1);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	185 const char* password = lua_tostring(state, 2);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	186 that.httpClient_.SetCredentials(username, password);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	187 }
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	188
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	189 return 0;
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	190 }
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	191
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	192
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	193 bool LuaContext::AnswerHttpQuery(lua_State* state)
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	194 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	195 std::string str;
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	196
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	197 try
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	198 {
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	199 httpClient_.Apply(str);
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	200 }
1545 33d34bc4ac15 fix msvc warnings jodogne parents: 1486 diff changeset	201 catch (OrthancException&)
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	202 {
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	203 return false;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	204 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	205
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	206 // 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	207 lua_pushlstring(state, str.c_str(), str.size());
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	208
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	209 return true;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	210 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	211
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	212 void LuaContext::SetHttpHeaders(lua_State *state, int top)
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	213 {
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	214 this->httpClient_.ClearHeaders(); // always reset headers in case they have been set in a previous request
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	215
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	216 if (lua_gettop(state) >= top)
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	217 {
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	218 Json::Value headers;
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	219 this->GetJson(headers, top, true);
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	220
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	221 Json::Value::Members members = headers.getMemberNames();
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	222
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	223 for (Json::Value::Members::const_iterator
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	224 it = members.begin(); it != members.end(); ++it)
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	225 {
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	226 this->httpClient_.AddHeader(it, headers[it].asString());
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	227 }
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	228 }
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	229
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	230 }
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	231
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	232
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	233
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	234 int LuaContext::CallHttpGet(lua_State *state)
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	235 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	236 LuaContext& that = GetLuaContext(state);
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 // Check the types of the arguments
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	239 int nArgs = lua_gettop(state);
2261 c4b16f107f19 fix amazy parents: 2258 diff changeset	240 if ((nArgs < 1 \|\| nArgs > 2) \|\| // check args count
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	241 !lua_isstring(state, 1)) // URL is a string
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	242 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	243 LOG(ERROR) << "Lua: Bad parameters to HttpGet()";
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	244 lua_pushnil(state);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	245 return 1;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	246 }
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 // Configure the HTTP client class
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	249 const char* url = lua_tostring(state, 1);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	250 that.httpClient_.SetMethod(HttpMethod_Get);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	251 that.httpClient_.SetUrl(url);
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	252 that.httpClient_.GetBody().clear();
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	253 that.SetHttpHeaders(state, 2);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	254
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	255 // Do the HTTP GET request
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	256 if (!that.AnswerHttpQuery(state))
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	257 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	258 LOG(ERROR) << "Lua: Error in HttpGet() for URL " << url;
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	259 lua_pushnil(state);
1052 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
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	262 return 1;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	263 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	264
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	265
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	266 int LuaContext::CallHttpPostOrPut(lua_State *state,
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	267 HttpMethod method)
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 LuaContext& that = GetLuaContext(state);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	270
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	271 // Check the types of the arguments
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	272 int nArgs = lua_gettop(state);
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	273 if ((nArgs < 1 \|\| nArgs > 3) \|\| // check arg count
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	274 !lua_isstring(state, 1) \|\| // URL is a string
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	275 (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	276 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	277 LOG(ERROR) << "Lua: Bad parameters to HttpPost() or HttpPut()";
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	278 lua_pushnil(state);
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	279 return 1;
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	280 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	281
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	282 // Configure the HTTP client class
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	283 const char* url = lua_tostring(state, 1);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	284 that.httpClient_.SetMethod(method);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	285 that.httpClient_.SetUrl(url);
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	286 that.SetHttpHeaders(state, 3);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	287
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	288 if (nArgs >= 2 && !lua_isnil(state, 2))
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	289 {
2724 c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	290 size_t bodySize = 0;
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	291 const char* bodyData = lua_tolstring(state, 2, &bodySize);
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	292
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	293 if (bodySize == 0)
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	294 {
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	295 that.httpClient_.GetBody().clear();
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	296 }
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	297 else
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	298 {
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	299 that.httpClient_.GetBody().assign(bodyData, bodySize);
c8d369400ae1 fix issue #77 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	300 }
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	301 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	302 else
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	303 {
1606 31f4adefb88f issuing HTTP requests from the plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	304 that.httpClient_.GetBody().clear();
1052 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
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	307 // Do the HTTP POST/PUT request
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	308 if (!that.AnswerHttpQuery(state))
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	309 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	310 LOG(ERROR) << "Lua: Error in HttpPost() or HttpPut() for URL " << url;
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	311 lua_pushnil(state);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	312 }
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 1;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	315 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	316
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 int LuaContext::CallHttpPost(lua_State *state)
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	319 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	320 return CallHttpPostOrPut(state, HttpMethod_Post);
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
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	323
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	324 int LuaContext::CallHttpPut(lua_State *state)
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 return CallHttpPostOrPut(state, HttpMethod_Put);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	327 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	328
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 int LuaContext::CallHttpDelete(lua_State *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 LuaContext& that = GetLuaContext(state);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	333
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	334 // Check the types of the arguments
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	335 int nArgs = lua_gettop(state);
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	336 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	337 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	338 LOG(ERROR) << "Lua: Bad parameters to HttpDelete()";
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	339 lua_pushnil(state);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	340 return 1;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	341 }
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	342
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	343 // Configure the HTTP client class
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	344 const char* url = lua_tostring(state, 1);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	345 that.httpClient_.SetMethod(HttpMethod_Delete);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	346 that.httpClient_.SetUrl(url);
2258 cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	347 that.httpClient_.GetBody().clear();
cd70a86618b4 added Http headers support to HttpPost/Get/Put/Delete amazy parents: 2244 diff changeset	348 that.SetHttpHeaders(state, 2);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	349
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	350 // Do the HTTP DELETE request
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	351 std::string s;
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	352 if (!that.httpClient_.Apply(s))
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	353 {
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	354 LOG(ERROR) << "Lua: Error in HttpDelete() for URL " << url;
1438 af112b7d9cba fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	355 lua_pushnil(state);
1052 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 else
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	358 {
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	359 lua_pushstring(state, "SUCCESS");
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	360 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	361
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	362 return 1;
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
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	366 void LuaContext::PushJson(const Json::Value& value)
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	367 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	368 if (value.isString())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	369 {
1465 905842836ad4 sample Lua script to write DICOM series to disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 1448 diff changeset	370 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	371 lua_pushlstring(lua_, s.c_str(), s.size());
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	372 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	373 else if (value.isDouble())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	374 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	375 lua_pushnumber(lua_, value.asDouble());
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	376 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	377 else if (value.isInt())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	378 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	379 lua_pushinteger(lua_, value.asInt());
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	380 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	381 else if (value.isUInt())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	382 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	383 lua_pushinteger(lua_, value.asUInt());
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	384 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	385 else if (value.isBool())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	386 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	387 lua_pushboolean(lua_, value.asBool());
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	388 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	389 else if (value.isNull())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	390 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	391 lua_pushnil(lua_);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	392 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	393 else if (value.isArray())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	394 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	395 lua_newtable(lua_);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	396
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	397 // http://lua-users.org/wiki/SimpleLuaApiExample
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	398 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	399 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	400 // 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	401 lua_pushnumber(lua_, i + 1);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	402
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	403 // Push the value of the cell
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	404 PushJson(value[i]);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	405
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	406 // Stores the pair in the table
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	407 lua_rawset(lua_, -3);
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 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	410 else if (value.isObject())
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	411 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	412 lua_newtable(lua_);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	413
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	414 Json::Value::Members members = value.getMemberNames();
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	415
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	416 for (Json::Value::Members::const_iterator
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	417 it = members.begin(); it != members.end(); ++it)
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	418 {
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	419 // 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	420 lua_pushlstring(lua_, it->c_str(), it->size());
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	421
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	422 // Push the value of the cell
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	423 PushJson(value[*it]);
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	424
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	425 // Stores the pair in the table
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	426 lua_rawset(lua_, -3);
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 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	429 else
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	430 {
1583 9ea3d082b064 got rid of custom exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1545 diff changeset	431 throw OrthancException(ErrorCode_JsonToLuaTable);
1051 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 }
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	434
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	436 void LuaContext::GetJson(Json::Value& result,
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 {
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	440 if (lua_istable(lua_, 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
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	451 lua_pushvalue(lua_, top);
1447 5ba7471780ae refactoring: HttpToolbox, DumpJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1438 diff changeset	452 // stack now contains: -1 => table
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	453 lua_pushnil(lua_);
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
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	455 while (lua_next(lua_, -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
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	459 lua_pushvalue(lua_, -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
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	461 std::string key(lua_tostring(lua_, -1));
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	462 Json::Value v;
1658 54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	463 GetJson(v, -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
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	482 lua_pop(lua_, 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
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	488 lua_pop(lua_, 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 }
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	505 else if (lua_isnil(lua_, top))
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 &&
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	510 lua_isboolean(lua_, top))
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	511 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	512 result = lua_toboolean(lua_, 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 &&
54bafe0e7e7b Optional argument "keepStrings" in "DumpJson()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1606 diff changeset	515 lua_isnumber(lua_, 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
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	518 double value = static_cast<double>(lua_tonumber(lua_, top));
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 }
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	531 else if (lua_isstring(lua_, top))
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.
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	535 result = std::string(lua_tostring(lua_, top));
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	536 }
2220 0fb6e0461105 fix handling of Booleans in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	537 else if (lua_isboolean(lua_, top))
0fb6e0461105 fix handling of Booleans in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	538 {
0fb6e0461105 fix handling of Booleans in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	539 result = lua_toboolean(lua_, top) ? true : false;
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);
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	561 lua_register(lua_, "HttpGet", CallHttpGet);
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	562 lua_register(lua_, "HttpPost", CallHttpPost);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	563 lua_register(lua_, "HttpPut", CallHttpPut);
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	564 lua_register(lua_, "HttpDelete", CallHttpDelete);
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	565 lua_register(lua_, "SetHttpCredentials", SetHttpCredentials);
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	566
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	567 SetGlobalVariable("_LuaContext", this);
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	568 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	569
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	570
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	571 LuaContext::~LuaContext()
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 lua_close(lua_);
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574 }
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
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	577 void LuaContext::ExecuteInternal(std::string* output,
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	578 const std::string& command)
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	579 {
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	580 log_.clear();
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	581 int error = (luaL_loadbuffer(lua_, command.c_str(), command.size(), "line") \|\|
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	582 lua_pcall(lua_, 0, 0, 0));
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	584 if (error)
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	585 {
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 assert(lua_gettop(lua_) >= 1);
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	588 std::string description(lua_tostring(lua_, -1));
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589 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	590 throw OrthancException(ErrorCode_CannotExecuteLua, description);
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591 }
418 b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	592
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	593 if (output != NULL)
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	594 {
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	595 *output = log_;
b79bf2f4ab2e execution of lua through REST Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	596 }
386 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
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	599
2379 4900688827a8 reorganization in CMake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2262 diff changeset	600 #if ORTHANC_HAS_EMBEDDED_RESOURCES == 1
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601 void LuaContext::Execute(EmbeddedResources::FileResourceId resource)
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	602 {
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 std::string command;
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604 EmbeddedResources::GetFileResource(command, resource);
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	605 ExecuteInternal(NULL, command);
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	606 }
2379 4900688827a8 reorganization in CMake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2262 diff changeset	607 #endif
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	608
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	609
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	610 bool LuaContext::IsExistingFunction(const char* name)
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	611 {
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	612 lua_settop(lua_, 0);
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	613 lua_getglobal(lua_, name);
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	614 return lua_type(lua_, -1) == LUA_TFUNCTION;
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	615 }
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	616
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	617
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	618 void LuaContext::Execute(Json::Value& output,
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	619 const std::string& command)
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 std::string s;
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	622 ExecuteInternal(&s, command);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	623
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	624 Json::Reader reader;
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	625 if (!reader.parse(s, output))
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	626 {
1596 f2e3d030ea59 BadJson error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	627 throw OrthancException(ErrorCode_BadJson);
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	628 }
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	629 }
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1052 diff changeset	630
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	631
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	632 void LuaContext::RegisterFunction(const char* name,
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	633 lua_CFunction func)
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	634 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	635 lua_register(lua_, name, func);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	636 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	637
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	638
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	639 void LuaContext::SetGlobalVariable(const char* name,
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	640 void* value)
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	641 {
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	642 lua_pushlightuserdata(lua_, value);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	643 lua_setglobal(lua_, name);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	644 }
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	645
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 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	648 const char* name)
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 lua_getglobal(state, name);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	651 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	652 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	653 lua_pop(state, 1);
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	654 return value;
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	655 }
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656 }

Mercurial > hg > orthanc

annotate Core/Lua/LuaContext.cpp @ 3346:f509d3c6d570