util.set: Rename private items container, optimise set.difference() and add set.inter...

[prosody.git] / util / stanza.lua

diff --git a/util/stanza.lua b/util/stanza.lua
index a4a8919152e8171719e256443e0a290fd1ab88eb..1ad3679ba84579bc92122d18146272bdc9730ad7 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -1,29 +1,21 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM v0.4
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
 local t_insert      =  table.insert;
 local t_concat      =  table.concat;
 local t_remove      =  table.remove;
+local t_concat      =  table.concat;
 local s_format      = string.format;
+local s_match       =  string.match;
 local tostring      =      tostring;
 local setmetatable  =  setmetatable;
+local getmetatable  =  getmetatable;
 local pairs         =         pairs;
 local ipairs        =        ipairs;
 local type          =          type;
@@ -31,7 +23,7 @@ local next          =          next;
 local print         =         print;
 local unpack        =        unpack;
 local s_gsub        =   string.gsub;
-local os = os;
+local os            =            os;
 
 local do_pretty_printing = not os.getenv("WINDIR");
 local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
@@ -86,11 +78,17 @@ function stanza_mt:add_child(child)
 end
 
 function stanza_mt:child_with_name(name)
-       for _, child in ipairs(self) 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    
+               if child.attr.xmlns == ns then return child; end
+       end
+end
+
 function stanza_mt:children()
        local i = 0;
        return function (a)
@@ -117,22 +115,31 @@ end
 
 local xml_escape = xml_escape;
 
-local function dostring(t, buf, self)
+local function dostring(t, buf, self, xml_escape)
+       local nsid, ns, attrk = 0;
        t_insert(buf, "<");
        t_insert(buf, t.name);
-       if t.attr then
-               for k, v in pairs(t.attr) do if type(k) == "string" then
-                       t_insert(buf, " ");
-                       t_insert(buf, k);
+       for k, v in pairs(t.attr) do if type(k) == "string" then
+               t_insert(buf, " ");
+               ns, attrk = s_match(k, "^([^|]+)|(.+)$");
+               if ns then
+                       nsid = (nsid or -1) + 1;
+                       t_insert(buf, "xmlns:ns"..nsid);
                        t_insert(buf, "='");
-                       t_insert(buf, (xml_escape(tostring(v))));
-                       t_insert(buf, "'");
-               end end
-       end
+                       t_insert(buf, (xml_escape(tostring(ns))));
+                       t_insert(buf, "' ");
+                       t_insert(buf, "ns"..nsid..":"..attrk);
+               else
+                       t_insert(buf, k);
+               end
+               t_insert(buf, "='");
+               t_insert(buf, (xml_escape(tostring(v))));
+               t_insert(buf, "'");
+       end end
        t_insert(buf, ">");
        for n, child in ipairs(t) do
                if child.name then 
-                       self(child, buf, self);
+                       self(child, buf, self, xml_escape);
                else
                        t_insert(buf, (xml_escape(child)));
                end
@@ -144,10 +151,11 @@ end
 
 function stanza_mt.__tostring(t)
        local buf = {};
-       dostring(t, buf, dostring);
+       dostring(t, buf, dostring, xml_escape);
        return t_concat(buf);
 end
 
+
 function stanza_mt.top_tag(t)
        local attr_string = "";
        if t.attr then
@@ -199,12 +207,33 @@ function deserialize(stanza)
                                end
                        end
                        stanza.tags = tags;
+                       if not stanza.last_add then
+                               stanza.last_add = {};
+                       end
                end
        end
        
        return stanza;
 end
 
+function clone(stanza)
+    local lookup_table = {};
+    local function _copy(object)
+        if type(object) ~= "table" then
+            return object;
+        elseif lookup_table[object] then
+            return lookup_table[object];
+        end
+        local new_table = {};
+        lookup_table[object] = new_table;
+        for index, value in pairs(object) do
+            new_table[_copy(index)] = _copy(value);
+        end
+        return setmetatable(new_table, getmetatable(object));
+    end
+    return _copy(stanza)
+end
+
 function message(attr, body)
        if not body then
                return stanza("message", attr);