prosody: util/xml.lua@30c96a5db360 (annotated)

5213 cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	2	local st = require "util.stanza";
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	3	local lxp = require "lxp";
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	4
6780 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6672 diff changeset	5	local _ENV = nil;
5213 cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	6
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	7	local parse_xml = (function()
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	8	local ns_prefixes = {
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	9	["http://www.w3.org/XML/1998/namespace"] = "xml";
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	10	};
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	11	local ns_separator = "\1";
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	12	local ns_pattern = "^([^"..ns_separator.."])"..ns_separator.."?(.)$";
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	13	return function(xml)
6666 d3023dd07cb6 portmanager, s2smanager, sessionmanager, stanza_router, storagemanager, usermanager, util.xml: Add luacheck annotations Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	14	--luacheck: ignore 212/self
5213 cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	15	local handler = {};
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	16	local stanza = st.stanza("root");
6981 30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	17	local namespaces = {}
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	18	function handler:StartNamespaceDecl(prefix, url)
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	19	if prefix ~= nil then
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	20	namespaces[prefix] = url
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	21	end
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	22	end
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	23	function handler:EndNamespaceDecl(prefix)
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	24	if prefix ~= nil then
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	25	namespaces[prefix] = nil
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	26	end
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	27	end
5213 cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	28	function handler:StartElement(tagname, attr)
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	29	local curr_ns,name = tagname:match(ns_pattern);
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	30	if name == "" then
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	31	curr_ns, name = "", curr_ns;
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	32	end
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	33	if curr_ns ~= "" then
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	34	attr.xmlns = curr_ns;
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	35	end
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	36	for i=1,#attr do
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	37	local k = attr[i];
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	38	attr[i] = nil;
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	39	local ns, nm = k:match(ns_pattern);
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	40	if nm ~= "" then
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5223 diff changeset	41	ns = ns_prefixes[ns];
bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5223 diff changeset	42	if ns then
5213 cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	43	attr[ns..":"..nm] = attr[k];
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	44	attr[k] = nil;
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	45	end
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	46	end
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	47	end
6981 30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	48	local n = {}
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	49	for prefix, url in pairs(namespaces) do
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	50	n[prefix] = url
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	51	end
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6780 diff changeset	52	stanza:tag(name, attr, n);
5213 cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	53	end
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	54	function handler:CharacterData(data)
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	55	stanza:text(data);
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	56	end
6672 7da8b6bc0966 util.xml: Remove unused parameter (thanks, luacheck) Matthew Wild <mwild1@gmail.com> parents: 6666 diff changeset	57	function handler:EndElement()
5213 cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	58	stanza:up();
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	59	end
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	60	local parser = lxp.new(handler, "\1");
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	61	local ok, err, line, col = parser:parse(xml);
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	62	if ok then ok, err, line, col = parser:parse(); end
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	63	--parser:close();
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	64	if ok then
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	65	return stanza.tags[1];
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	66	else
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	67	return ok, err.." (line "..line..", col "..col..")";
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	68	end
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	69	end;
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	70	end)();
cc487921746b util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	71
6780 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6672 diff changeset	72	return {
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6672 diff changeset	73	parse = parse_xml;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6672 diff changeset	74	};

author	Matthew Wild <mwild1@gmail.com>
	Tue, 08 Dec 2015 23:15:42 +0000
changeset 6981	30c96a5db360
parent 6780	5de6b93d0190
child 7242	c9af793b2d8f
permissions	-rw-r--r--