pubsub/pep: get_node_affiliations resultset bugfix

SVN Revision: 1683

diff --git a/ChangeLog b/ChangeLog
index 34ac597e7a6e051615c0397cacfda06a33d806c1..63859f40a3b5fa5dc0bad092871801b0cfdeed05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-17  Christophe Romain <christophe.romain@process-one.net>
+
+       * src/mod_pubsub/node_pep.erl: Fix get_node_affiliations resultset to
+       owner (Thanks to Michal Schmidt)
+
 2008-11-12  Badlop  <badlop@process-one.net>
 
        * doc/guide.tex: Improve legibility of mod_irc example config

diff --git a/src/mod_pubsub/node_pep.erl b/src/mod_pubsub/node_pep.erl
index 3172eb4292593163850abea1907ccac59f7767ab..a9fdaf36e143a0623c43f57dce56899cfe64f7f6 100644 (file)
--- a/src/mod_pubsub/node_pep.erl
+++ b/src/mod_pubsub/node_pep.erl
@@ -168,14 +168,9 @@ get_entity_affiliations(_Host, Owner) ->
     OwnerKey = jlib:jid_tolower(jlib:jid_remove_resource(Owner)),
     node_default:get_entity_affiliations(OwnerKey, Owner).
 
-get_node_affiliations(_Host, Node) ->
-    States = mnesia:match_object(
-       #pubsub_state{stateid = {'_', {'_', Node}},
-       _ = '_'}),
-    Tr = fun(#pubsub_state{stateid = {J, {_, _}}, affiliation = A}) ->
-       {J, A}
-       end,
-    {result, lists:map(Tr, States)}.
+get_node_affiliations(Host, Node) ->
+    OwnerKey = jlib:jid_remove_resource(Host),
+    node_default:get_node_affiliations(OwnerKey, Node).
 
 get_affiliation(_Host, Node, Owner) ->
     OwnerKey = jlib:jid_tolower(jlib:jid_remove_resource(Owner)),