prosody: util/xml.lua@c9af793b2d8f (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";
7242 c9af793b2d8f util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree. Waqas Hussain <waqas20@gmail.com> parents: 6981 diff changeset	4	local t_insert = table.insert;
c9af793b2d8f util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree. Waqas Hussain <waqas20@gmail.com> parents: 6981 diff changeset	5	local t_remove = table.remove;
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
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	7	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	8
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	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	10	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	11	["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	12	};
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	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	14	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	15	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	16	--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	17	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	18	local stanza = st.stanza("root");
7242 c9af793b2d8f util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree. Waqas Hussain <waqas20@gmail.com> parents: 6981 diff changeset	19	local namespaces = {};
c9af793b2d8f util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree. Waqas Hussain <waqas20@gmail.com> parents: 6981 diff changeset	20	local prefixes = {};
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	21	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	22	if prefix ~= nil then
7242 c9af793b2d8f util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree. Waqas Hussain <waqas20@gmail.com> parents: 6981 diff changeset	23	t_insert(namespaces, url);
c9af793b2d8f util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree. Waqas Hussain <waqas20@gmail.com> parents: 6981 diff changeset	24	t_insert(prefixes, prefix);
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	25	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	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	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	28	if prefix ~= nil then
7242 c9af793b2d8f util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree. Waqas Hussain <waqas20@gmail.com> parents: 6981 diff changeset	29	-- we depend on each StartNamespaceDecl having a paired EndNamespaceDecl
c9af793b2d8f util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree. Waqas Hussain <waqas20@gmail.com> parents: 6981 diff changeset	30	t_remove(namespaces);
c9af793b2d8f util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree. Waqas Hussain <waqas20@gmail.com> parents: 6981 diff changeset	31	t_remove(prefixes);
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	32	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	33	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	34	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	35	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	36	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	37	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	38	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	39	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	40	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	41	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	42	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	43	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	44	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	45	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	46	if nm ~= "" then
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5223 diff changeset	47	ns = ns_prefixes[ns];
bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5223 diff changeset	48	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	49	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	50	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	51	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	52	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	53	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	54	local n = {}
7242 c9af793b2d8f util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree. Waqas Hussain <waqas20@gmail.com> parents: 6981 diff changeset	55	for i=1,#namespaces do
c9af793b2d8f util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree. Waqas Hussain <waqas20@gmail.com> parents: 6981 diff changeset	56	n[prefixes[i]] = namespaces[i];
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	57	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	58	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	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	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	61	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	62	end
6672 7da8b6bc0966 util.xml: Remove unused parameter (thanks, luacheck) Matthew Wild <mwild1@gmail.com> parents: 6666 diff changeset	63	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	64	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	65	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	66	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	67	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	68	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	69	--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	70	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	71	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	72	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	73	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	74	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	75	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	76	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	77
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	78	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	79	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	80	};

author	Waqas Hussain <waqas20@gmail.com>
	Sat, 05 Mar 2016 17:51:35 -0500
changeset 7242	c9af793b2d8f
parent 6981	30c96a5db360
child 8558	4f0f5b49bb03
permissions	-rw-r--r--