mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.datamapper: Fix arrays nesting one level too deep

Browse source
This commit is contained in:
Kim Alvefur 2021-03-19 01:17:59 +01:00
parent 3c3cdcd0c7
commit 7f04df223a
3 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
util/datamapper.lua
View file

@ -1,5 +1,7 @@
local st = require("util.stanza");
local schema_t = {}
local function toboolean(s)
if s == "true" or s == "1" then
return true
@ -181,7 +183,7 @@ local function parse(schema, s)
end
end
local function unparse(schema, t, current_name, current_ns)
local function unparse(schema, t, current_name, current_ns, ctx)
if schema.xml then
if schema.xml.name then
@ -193,7 +195,7 @@ local function unparse(schema, t, current_name, current_ns)
end
local out = st.stanza(current_name, {xmlns = current_ns})
local out = ctx or st.stanza(current_name, {xmlns = current_ns})
if schema.type == "object" then
@ -268,15 +270,13 @@ local function unparse(schema, t, current_name, current_ns)
out:add_direct_child(c);
end
elseif proptype == "array" and type(propschema) == "table" and type(v) == "table" then
local c = unparse(propschema, v, name, namespace);
if c then
if value_where == "in_wrapper" then
local w = st.stanza(propschema.xml.name or name, {xmlns = propschema.xml.namespace or namespace})
w:add_direct_child(c);
out:add_direct_child(w);
else
if value_where == "in_wrapper" then
local c = unparse(propschema, v, name, namespace);
if c then
out:add_direct_child(c);
end
else
unparse(propschema, v, name, namespace, out);
end
else
error("NYI")