aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2021-03-14 03:06:37 +0100
committerKim Alvefur <zash@zash.se>2021-03-14 03:06:37 +0100
commit3a62af2e0e6df40c2691f94eb2a496d8c45828ad (patch)
tree8fe4bc9f3c86ad41967f4bc34c722283d3b0132b /util
parenta7b010cbc511a8a55a43af4f3a68d8e61b8aa1ba (diff)
downloadprosody-3a62af2e0e6df40c2691f94eb2a496d8c45828ad.tar.gz
prosody-3a62af2e0e6df40c2691f94eb2a496d8c45828ad.zip
util.datamapper: Separate extraction of xml from coercion to target type
Now it gets the text, attribute or name first, then turns it into whatever the schema wants. This should be easier to further factor out into preparation for array support.
Diffstat (limited to 'util')
-rw-r--r--util/datamapper.lua62
1 files changed, 28 insertions, 34 deletions
diff --git a/util/datamapper.lua b/util/datamapper.lua
index a39264cc..d642c881 100644
--- a/util/datamapper.lua
+++ b/util/datamapper.lua
@@ -5,6 +5,18 @@ local function toboolean(s)
return true
elseif s == "false" or s == "0" then
return false
+ elseif s then
+ return true
+ end
+end
+
+local function totype(t, s)
+ if t == "string" then
+ return s
+ elseif t == "boolean" then
+ return toboolean(s)
+ elseif t == "number" or t == "integer" then
+ return tonumber(s)
end
end
@@ -29,6 +41,10 @@ local function parse_object(schema, s)
proptype = propschema
end
+ if proptype == "object" or proptype == "array" then
+ value_where = "in_children"
+ end
+
if type(propschema) == "table" and propschema.xml then
if propschema.xml.name then
name = propschema.xml.name
@@ -59,6 +75,7 @@ local function parse_object(schema, s)
end
end
+ local value
if value_where == "in_tag_name" then
local c
if proptype == "boolean" then
@@ -74,11 +91,7 @@ local function parse_object(schema, s)
else
c = s:get_child(nil, namespace);
end
- if c and proptype == "string" then
- out[prop] = c.name;
- elseif proptype == "boolean" and c then
- out[prop] = true;
- end
+ value = c.name;
elseif value_where == "in_attribute" then
local attr = name
if prefix then
@@ -86,40 +99,18 @@ local function parse_object(schema, s)
elseif namespace ~= s.attr.xmlns then
attr = namespace .. "\1" .. name
end
- if proptype == "string" then
- out[prop] = s.attr[attr]
- elseif proptype == "integer" or proptype == "number" then
-
- out[prop] = tonumber(s.attr[attr])
- elseif proptype == "boolean" then
- out[prop] = toboolean(s.attr[attr])
-
- end
+ value = s.attr[attr]
elseif value_where == "in_text" then
- if proptype == "string" then
- out[prop] = s:get_text()
- elseif proptype == "integer" or proptype == "number" then
- out[prop] = tonumber(s:get_text())
- end
+ value = s:get_text()
elseif value_where == "in_single_attribute" then
local c = s:get_child(name, namespace)
- local a = c and c.attr[single_attribute]
- if proptype == "string" then
- out[prop] = a
- elseif proptype == "integer" or proptype == "number" then
- out[prop] = tonumber(a)
- elseif proptype == "boolean" then
- out[prop] = toboolean(a)
- end
- else
-
- if proptype == "string" then
- out[prop] = s:get_child_text(name, namespace)
- elseif proptype == "integer" or proptype == "number" then
- out[prop] = tonumber(s:get_child_text(name, namespace))
- elseif proptype == "object" and type(propschema) == "table" then
+ value = c and c.attr[single_attribute]
+ elseif value_where == "in_text_tag" then
+ value = s:get_child_text(name, namespace)
+ elseif value_where == "in_children" and type(propschema) == "table" then
+ if proptype == "object" then
local c = s:get_child(name, namespace)
if c then
out[prop] = parse_object(propschema, c);
@@ -127,6 +118,9 @@ local function parse_object(schema, s)
end
end
+ if value_where ~= "in_children" then
+ out[prop] = totype(proptype, value)
+ end
end
end