diff options
| author |   Clément Bénier <clement.benier@iot.bzh> | 2018-11-22 10:52:30 +0100 |
|---|---|---|
| committer | Clément Bénier <clement.benier@iot.bzh> | 2018-11-22 11:01:02 +0100 |
| commit | 309003b66de9c62c36a8063925e017a8a0b2cdf0 (patch) | |
| tree | 48832a59baaea84522990ce59556f4906e0ca726 | |
| parent | 33abde52666af1335571252143d21de5d305ca9c (diff) | |
AFB:servsync: add string for query argumentguppy_6.99.1guppy/6.99.16.99.1
for query argument add string that will be converted to json object
Change-Id: I75b669a6c02838fd31017b82e9093966f3eea0e6
Signed-off-by: Clément Bénier <clement.benier@iot.bzh>
| -rw-r--r-- | ctl-lib/ctl-lua.c | 9 |
1 files changed, 7 insertions, 2 deletions
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); |