From 26d581e7727ef952d1f849800b33961a36393b5c Mon Sep 17 00:00:00 2001 From: Clément Bénier Date: Thu, 22 Nov 2018 10:52:30 +0100 Subject: AFB:servsync: add string for query argument MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit for query argument add string that will be converted to json object Change-Id: I75b669a6c02838fd31017b82e9093966f3eea0e6 Signed-off-by: Clément Bénier --- ctl-lib/ctl-lua.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'ctl-lib/ctl-lua.c') diff --git a/ctl-lib/ctl-lua.c b/ctl-lib/ctl-lua.c index 1a2554c..08c9b85 100644 --- a/ctl-lib/ctl-lua.c +++ b/ctl-lib/ctl-lua.c @@ -498,7 +498,7 @@ static int LuaAfbServiceSync(lua_State* luaState) { } // note: argument start at 2 because of AFB: table - if (count != 5 || !lua_isstring(luaState, LUA_FIRST_ARG + 1) || !lua_isstring(luaState, LUA_FIRST_ARG + 2) || !lua_istable(luaState, LUA_FIRST_ARG + 3)) { + if (count != 5 || !lua_isstring(luaState, LUA_FIRST_ARG + 1) || !lua_isstring(luaState, LUA_FIRST_ARG + 2) || (!lua_istable(luaState, LUA_FIRST_ARG + 3) && !lua_isstring(luaState, LUA_FIRST_ARG +3))) { lua_pushliteral(luaState, "ERROR: syntax AFB:servsync(source, api, verb, {[Lua Table]})"); lua_error(luaState); return 1; @@ -508,7 +508,12 @@ static int LuaAfbServiceSync(lua_State* luaState) { // get source/api/verb+query const char *api = lua_tostring(luaState, LUA_FIRST_ARG + 1); const char *verb = lua_tostring(luaState, LUA_FIRST_ARG + 2); - json_object *queryJ = LuaTableToJson(source, luaState, LUA_FIRST_ARG + 3); + json_object *queryJ = NULL; + if (lua_istable(luaState, LUA_FIRST_ARG + 3)) { + queryJ = LuaTableToJson(source, luaState, LUA_FIRST_ARG + 3); + } else { + queryJ = json_object_new_string(lua_tostring(luaState, LUA_FIRST_ARG + 3)); + } int iserror = AFB_ServiceSync(source->api, api, verb, queryJ, &responseJ); -- cgit 1.2.3-korg