X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fstanza.lua;h=28e26e0a407232701ce7b2bdc8af0efa41e473e3;hb=81c3f36b542816494b6181128cce9d34c8017760;hp=d295d5cc35a5fb5453d2fd5906d79b0ec84fe2e4;hpb=c435d0bd7afd6d625a5073cc35a2cc9500bdaf21;p=prosody.git

diff --git a/util/stanza.lua b/util/stanza.lua
index d295d5cc..28e26e0a 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -38,6 +38,8 @@ if do_pretty_printing then
 	end
 end
 
+local xmlns_stanzas = "urn:ietf:params:xml:ns:xmpp-stanzas";
+
 module "stanza"
 
 stanza_mt = { __type = "stanza" };
@@ -65,7 +67,7 @@ end
 
 function stanza_mt:text(text)
 	(self.last_add[#self.last_add] or self):add_direct_child(text);
-	return self; 
+	return self;
 end
 
 function stanza_mt:up()
@@ -93,14 +95,25 @@ function stanza_mt:add_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)
+			and ((not xmlns and self.attr.xmlns == child.attr.xmlns)
+				or child.attr.xmlns == xmlns) then
+			
+			return child;
+		end
+	end
+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
@@ -109,11 +122,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)
@@ -121,7 +149,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
@@ -180,6 +231,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:children() 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 or "";
+end
+
 function stanza_mt.__add(s1, s2)
 	return s1:add_direct_child(s2);
 end
@@ -212,14 +287,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
@@ -268,7 +343,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)
@@ -280,13 +355,16 @@ function reply(orig)
 	return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or orig.attr.type) });
 end
 
-function error_reply(orig, type, condition, message)
-	local t = reply(orig);
-	t.attr.type = "error";
-	t:tag("error", {type = type})
-		:tag(condition, {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
-	if (message) then t:tag("text"):text(message):up(); end
-	return t; -- stanza ready for adding app-specific errors
+do
+	local xmpp_stanzas_attr = { xmlns = xmlns_stanzas };
+	function error_reply(orig, type, condition, message)
+		local t = reply(orig);
+		t.attr.type = "error";
+		t:tag("error", {type = type}) --COMPAT: Some day xmlns:stanzas goes here
+			:tag(condition, xmpp_stanzas_attr):up();
+		if (message) then t:tag("text", xmpp_stanzas_attr):text(message):up(); end
+		return t; -- stanza ready for adding app-specific errors
+	end
 end
 
 function presence(attr)
@@ -306,7 +384,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();