diff options
Diffstat (limited to 'util/template.lua')
| -rw-r--r-- | util/template.lua | 64 |
1 files changed, 14 insertions, 50 deletions
diff --git a/util/template.lua b/util/template.lua index ebd8be14..66d4fca7 100644 --- a/util/template.lua +++ b/util/template.lua @@ -1,64 +1,28 @@ -local st = require "util.stanza"; -local lxp = require "lxp"; +local stanza_mt = require "util.stanza".stanza_mt; local setmetatable = setmetatable; local pairs = pairs; local ipairs = ipairs; local error = error; local loadstring = loadstring; local debug = debug; +local t_remove = table.remove; +local parse_xml = require "util.xml".parse; module("template") -local parse_xml = (function() - local ns_prefixes = { - ["http://www.w3.org/XML/1998/namespace"] = "xml"; - }; - local ns_separator = "\1"; - local ns_pattern = "^([^"..ns_separator.."]*)"..ns_separator.."?(.*)$"; - return function(xml) - local handler = {}; - local stanza = st.stanza("root"); - function handler:StartElement(tagname, attr) - local curr_ns,name = tagname:match(ns_pattern); - if name == "" then - curr_ns, name = "", curr_ns; - end - if curr_ns ~= "" then - attr.xmlns = curr_ns; - end - for i=1,#attr do - local k = attr[i]; - attr[i] = nil; - local ns, nm = k:match(ns_pattern); - if nm ~= "" then - ns = ns_prefixes[ns]; - if ns then - attr[ns..":"..nm] = attr[k]; - attr[k] = nil; - end - end - end - stanza:tag(name, attr); - end - function handler:CharacterData(data) - data = data:gsub("^%s*", ""):gsub("%s*$", ""); - stanza:text(data); - end - function handler:EndElement(tagname) - stanza:up(); - end - local parser = lxp.new(handler, "\1"); - local ok, err, line, col = parser:parse(xml); - if ok then ok, err, line, col = parser:parse(); end - --parser:close(); - if ok then - return stanza.tags[1]; +local function trim_xml(stanza) + for i=#stanza,1,-1 do + local child = stanza[i]; + if child.name then + trim_xml(child); else - return ok, err.." (line "..line..", col "..col..")"; + child = child:gsub("^%s*", ""):gsub("%s*$", ""); + stanza[i] = child; + if child == "" then t_remove(stanza, i); end end - end; -end)(); + end +end local function create_string_string(str) str = ("%q"):format(str); @@ -100,7 +64,6 @@ local function create_clone_string(stanza, lookup, xmlns) end return lookup[stanza]; end -local stanza_mt = st.stanza_mt; local function create_cloner(stanza, chunkname) local lookup = {}; local name = create_clone_string(stanza, lookup, ""); @@ -118,6 +81,7 @@ local template_mt = { __tostring = function(t) return t.name end }; local function create_template(templates, text) local stanza, err = parse_xml(text); if not stanza then error(err); end + trim_xml(stanza); local info = debug.getinfo(3, "Sl"); info = info and ("template(%s:%d)"):format(info.short_src:match("[^\\/]*$"), info.currentline) or "template(unknown)"; |