Comparison

mod_archive: there can be only one note/previous/next/x element in a collection.

author	shinysky<shinysky1986(AT)gmail.com>
date	Sun, 27 Jun 2010 15:04:24 +0800
parent	187:670c99e96c52
child	193:18a0e5c0bb62

comparison

equal deleted inserted replaced

-:670c99e96c52
+:5e8ea3733dc6
 if collection.attr["with"] == elem.attr["with"]
 and collection.attr["start"] == elem.attr["start"] then
 -- TODO check if there're duplicates
 for newchild in elem:children() do
 if type(newchild) == "table" then
-collection:add_child(newchild)
+if newchild.name == "from" or newchild.name == "to" then
+collection:add_child(newchild);
+elseif newchild.name == "note" or newchild.name == "previous" or newchild.name == "next" or newchild.name == "x" then
+local found = false;
+for i, c in ipairs(collection) do
+if c.name == newchild.name then
+found = true;
+collection[i] = newchild;
+break;
+end
+end
+if not found then
+collection:add_child(newchild);
+end
+end
 end
 end
 local ver = tonumber(collection.attr["version"]) + 1;
 collection.attr["version"] = tostring(ver);
 collection.attr["subject"] = elem.attr["subject"];
 end
 end
 -- not found, create new collection
 elem.attr["version"] = "0";
 origin.send(st.reply(stanza):add_child(save_result(elem)));
+-- TODO check if elem is valid(?)
 dm.list_append(node, host, ARCHIVE_DIR, st.preserialize(elem));
 -- TODO unsuccessful reply
 return true;
 end