X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fstanza.lua;h=afaf9ce90b47e395d442c30b47a3bf2a95171bbe;hb=0ef23c673d1d620c9c1cc3e8aed43add63634426;hp=b039993f9137abd020a3241195497a58e5068895;hpb=bc6bd75cf9e3008d3429376a95da7459f9f61f0c;p=prosody.git

diff --git a/util/stanza.lua b/util/stanza.lua
index b039993f..afaf9ce9 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -46,7 +46,7 @@ stanza_mt = { __type = "stanza" };
 stanza_mt.__index = stanza_mt;
 
 function stanza(name, attr)
-	local stanza = { name = name, attr = attr or {}, tags = {}, last_add = {}};
+	local stanza = { name = name, attr = attr or {}, tags = {} };
 	return setmetatable(stanza, stanza_mt);
 end
 
@@ -60,26 +60,27 @@ end
 
 function stanza_mt:tag(name, attrs)
 	local s = stanza(name, attrs);
-	(self.last_add[#self.last_add] or self):add_direct_child(s);
-	t_insert(self.last_add, s);
+	local last_add = self.last_add;
+	if not last_add then last_add = {}; self.last_add = last_add; end
+	(last_add[#last_add] or self):add_direct_child(s);
+	t_insert(last_add, s);
 	return self;
 end
 
 function stanza_mt:text(text)
-	(self.last_add[#self.last_add] or self):add_direct_child(text);
-	return self; 
+	local last_add = self.last_add;
+	(last_add and last_add[#last_add] or self):add_direct_child(text);
+	return self;
 end
 
 function stanza_mt:up()
-	t_remove(self.last_add);
+	local last_add = self.last_add;
+	if last_add then t_remove(last_add); end
 	return self;
 end
 
 function stanza_mt:reset()
-	local last_add = self.last_add;
-	for i = 1,#last_add do
-		last_add[i] = nil;
-	end
+	self.last_add = nil;
 	return self;
 end
 
@@ -91,13 +92,14 @@ function stanza_mt:add_direct_child(child)
 end
 
 function stanza_mt:add_child(child)
-	(self.last_add[#self.last_add] or self):add_direct_child(child);
+	local last_add = self.last_add;
+	(last_add and last_add[#last_add] or self):add_direct_child(child);
 	return self;
 end
 
 function stanza_mt:get_child(name, xmlns)
 	for _, child in ipairs(self.tags) do
-		if (not name or child.name == name) 
+		if (not name or child.name == name)
 			and ((not xmlns and self.attr.xmlns == child.attr.xmlns)
 				or child.attr.xmlns == xmlns) then
 			
@@ -107,13 +109,13 @@ function stanza_mt:get_child(name, xmlns)
 end
 
 function stanza_mt:child_with_name(name)
-	for _, child in ipairs(self.tags) do	
+	for _, child in ipairs(self.tags) do
 		if child.name == name then return child; end
 	end
 end
 
 function stanza_mt:child_with_ns(ns)
-	for _, child in ipairs(self.tags) do	
+	for _, child in ipairs(self.tags) do
 		if child.attr.xmlns == ns then return child; end
 	end
 end
@@ -122,11 +124,26 @@ function stanza_mt:children()
 	local i = 0;
 	return function (a)
 			i = i + 1
-			local v = a[i]
-			if v then return v; end
+			return a[i];
 		end, self, i;
-	                                    
 end
+
+function stanza_mt:matching_tags(name, xmlns)
+	xmlns = xmlns or self.attr.xmlns;
+	local tags = self.tags;
+	local start_i, max_i = 1, #tags;
+	return function ()
+			for i=start_i,max_i do
+				v = tags[i];
+				if (not name or v.name == name)
+				and (not xmlns or xmlns == v.attr.xmlns) then
+					start_i = i+1;
+					return v;
+				end
+			end
+		end, tags, i;
+end
+
 function stanza_mt:childtags()
 	local i = 0;
 	return function (a)
@@ -134,7 +151,30 @@ function stanza_mt:childtags()
 			local v = self.tags[i]
 			if v then return v; end
 		end, self.tags[1], i;
-	                                    
+end
+
+function stanza_mt:maptags(callback)
+	local tags, curr_tag = self.tags, 1;
+	local n_children, n_tags = #self, #tags;
+	
+	local i = 1;
+	while curr_tag <= n_tags do
+		if self[i] == tags[curr_tag] then
+			local ret = callback(self[i]);
+			if ret == nil then
+				t_remove(self, i);
+				t_remove(tags, curr_tag);
+				n_children = n_children - 1;
+				n_tags = n_tags - 1;
+			else
+				self[i] = ret;
+				tags[i] = ret;
+			end
+			i = i + 1;
+			curr_tag = curr_tag + 1;
+		end
+	end
+	return self;
 end
 
 local xml_escape
@@ -193,6 +233,30 @@ function stanza_mt.get_text(t)
 	end
 end
 
+function stanza_mt.get_error(stanza)
+	local type, condition, text;
+	
+	local error_tag = stanza:get_child("error");
+	if not error_tag then
+		return nil, nil, nil;
+	end
+	type = error_tag.attr.type;
+	
+	for child in error_tag:childtags() do
+		if child.attr.xmlns == xmlns_stanzas then
+			if not text and child.name == "text" then
+				text = child:get_text();
+			elseif not condition then
+				condition = child.name;
+			end
+			if condition and text then
+				break;
+			end
+		end
+	end
+	return type, condition or "undefined-condition", text;
+end
+
 function stanza_mt.__add(s1, s2)
 	return s1:add_direct_child(s2);
 end
@@ -225,14 +289,14 @@ function deserialize(stanza)
 		for i=1,#attr do attr[i] = nil; end
 		local attrx = {};
 		for att in pairs(attr) do
-			if s_find(att, "|", 1, true) and not s_find(k, "\1", 1, true) then
-				local ns,na = s_match(k, "^([^|]+)|(.+)$");
+			if s_find(att, "|", 1, true) and not s_find(att, "\1", 1, true) then
+				local ns,na = s_match(att, "^([^|]+)|(.+)$");
 				attrx[ns.."\1"..na] = attr[att];
 				attr[att] = nil;
 			end
 		end
 		for a,v in pairs(attrx) do
-			attr[x] = v;
+			attr[a] = v;
 		end
 		setmetatable(stanza, stanza_mt);
 		for _, child in ipairs(stanza) do
@@ -249,9 +313,6 @@ function deserialize(stanza)
 				end
 			end
 			stanza.tags = tags;
-			if not stanza.last_add then
-				stanza.last_add = {};
-			end
 		end
 	end
 	
@@ -281,7 +342,7 @@ function message(attr, body)
 	if not body then
 		return stanza("message", attr);
 	else
-		return stanza("message", attr):tag("body"):text(body);
+		return stanza("message", attr):tag("body"):text(body):up();
 	end
 end
 function iq(attr)
@@ -322,7 +383,7 @@ if do_pretty_printing then
 	function stanza_mt.pretty_print(t)
 		local children_text = "";
 		for n, child in ipairs(t) do
-			if type(child) == "string" then	
+			if type(child) == "string" then
 				children_text = children_text .. xml_escape(child);
 			else
 				children_text = children_text .. child:pretty_print();