minor pubsub fixes

SVN Revision: 1782

ChangeLog

@@ -7,6 +7,17 @@
 	* src/mod_pubsub/node_default.erl: any entity can retrieve item when
 	node access model is "open" (thanks to Myers Carpenter)(EJAB-836)
 
+	* src/mod_pubsub/node_default.erl: use of del_items
+
+	* src/mod_pubsub/node.template: apply delete-any feature
+	* src/mod_pubsub/node_mb.erl: Likewise
+	* src/mod_pubsub/node_buddy.erl: Likewise
+	* src/mod_pubsub/node_private.erl: Likewise
+	* src/mod_pubsub/node_public.erl: Likewise
+	* src/mod_pubsub/node_pep.erl: Likewise
+	* src/mod_pubsub/node_default.erl: Likewise
+	* src/mod_pubsub/node_club.erl: Likewise
+
 2009-01-08	Pablo Polvorin	<pablo.polvorin@process-one.net>
 	* src/mod_vcard_ldap.erl, src/mod_muc/mod_muc.erl, src/mod_roster.hrl,
 	src/mod_offline_odbc.erl, src/ejabberd_s2s_in.erl, src/adhoc.erl,

src/mod_pubsub/node.template

@@ -95,6 +95,7 @@ options() ->
 features() ->
     ["create-nodes",
      "delete-nodes",
+     "delete-any",
      "instant-nodes",
      "outcast-affiliation",
      "persistent-items",

src/mod_pubsub/node_buddy.erl

@@ -98,6 +98,7 @@ options() ->
 features() ->
     ["create-nodes",
      "delete-nodes",
+     "delete-any",
      "instant-nodes",
      "item-ids",
      "outcast-affiliation",

src/mod_pubsub/node_club.erl

@@ -98,6 +98,7 @@ options() ->
 features() ->
     ["create-nodes",
      "delete-nodes",
+     "delete-any",
      "instant-nodes",
      "outcast-affiliation",
      "persistent-items",

src/mod_pubsub/node_default.erl

@@ -535,9 +535,7 @@ purge_node(Host, Node, Owner) ->
     GenState = get_state(Host, Node, GenKey),
     case GenState of
 	#pubsub_state{items = Items, affiliation = owner} ->
-	    lists:foreach(fun(ItemId) ->
-				  mnesia:delete({pubsub_item, {ItemId, {Host, Node}}})
-			  end, Items),
+	    del_items(Host, Node, Items),
 	    {result, {default, broadcast}};
 	_ ->
 	    %% Entity is not owner

src/mod_pubsub/node_mb.erl

@@ -102,6 +102,7 @@ features() ->
      "auto-create", %*
      "auto-subscribe", %*
      "delete-nodes", %*
+     "delete-any", %*
      "filtered-notifications", %*
      "modify-affiliations",
      "outcast-affiliation",

src/mod_pubsub/node_pep.erl

@@ -98,6 +98,7 @@ features() ->
      "auto-create", %*
      "auto-subscribe", %*
      "delete-nodes", %*
+     "delete-any", %*
      "filtered-notifications", %*
      "modify-affiliations",
      "outcast-affiliation",

src/mod_pubsub/node_private.erl

@@ -98,6 +98,7 @@ options() ->
 features() ->
     ["create-nodes",
      "delete-nodes",
+     "delete-any",
      "instant-nodes",
      "outcast-affiliation",
      "persistent-items",

src/mod_pubsub/node_public.erl

@@ -98,6 +98,7 @@ options() ->
 features() ->
     ["create-nodes",
      "delete-nodes",
+     "delete-any",
      "instant-nodes",
      "outcast-affiliation",
      "persistent-items",