pubsub/pep: get_node_affiliations resultset bugfix

SVN Revision: 1684

diff --git a/ChangeLog b/ChangeLog
index 98dfea079326c7a39bc408b7aa0e5251bfd9ed21..ed9072a86a00070ad8b6a0752d11a1e6ab91c704 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-24  Evgeniy Khramtsov <ekhramtsov@process-one.net>
 
        * src/eldap/Makefile.in: added +optimize and +driver

diff --git a/src/mod_pubsub/node_pep.erl b/src/mod_pubsub/node_pep.erl
index 6d2d2709eacfe7a9304e7d95592eb33037244496..1c1bff7d7271f7754296d06c2af976e045704a28 100644 (file)
--- a/src/mod_pubsub/node_pep.erl
+++ b/src/mod_pubsub/node_pep.erl
@@ -170,14 +170,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)),