From 747d25b4adc50570f4d073c50ca8a5aa9aaa0d65 Mon Sep 17 00:00:00 2001
From: Christophe Romain <christophe.romain@process-one.net>
Date: Tue, 21 Apr 2015 15:02:20 +0200
Subject: [PATCH] Fixed node type (thanks to saczawap) (#435)

---
 src/mod_pubsub.erl | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index 8fbdfbb6f..d5398fadf 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -1057,27 +1057,21 @@ command_disco_info(_Host, ?NS_PUBSUB_GET_PENDING, _From) ->
 node_disco_info(Host, Node, From) ->
     node_disco_info(Host, Node, From, true, true).
 
-node_disco_info(Host, Node, From, _Identity, _Features) ->
-    Action = fun (#pubsub_node{type = Type, id = Nidx}) ->
-	    Types = case tree_call(Host, get_subnodes, [Host, Node, From]) of
-		[] ->
-		    [<<"leaf">>];
-		_ ->
-		    case node_call(Host, Type, get_items, [Nidx, From, none]) of
-			{result, {[], _}} -> [<<"collection">>];
-			{result, _} -> [<<"leaf">>, <<"collection">>];
-			_ -> []
-		    end
+node_disco_info(Host, Node, _From, _Identity, _Features) ->
+    Action = fun (#pubsub_node{type = Type, options = Options}) ->
+	    NodeType = case get_option(Options, node_type) of
+		collection -> <<"collection">>;
+		_ -> <<"leaf">>
 	    end,
-	    I = [#xmlel{name = <<"identity">>,
-			attrs = [{<<"category">>, <<"pubsub">>}, {<<"type">>, T}]}
-		    || T <- Types],
+	    I = #xmlel{name = <<"identity">>,
+			attrs = [{<<"category">>, <<"pubsub">>},
+				 {<<"type">>, NodeType}]},
 	    F = [#xmlel{name = <<"feature">>,
 			attrs = [{<<"var">>, ?NS_PUBSUB}]}
 		    | [#xmlel{name = <<"feature">>,
 			    attrs = [{<<"var">>, feature(F)}]}
 			|| F <- plugin_features(Host, Type)]],
-	    {result, I ++ F}
+	    {result, [I | F]}
     end,
     case transaction(Host, Node, Action, sync_dirty) of
 	{result, {_, Result}} -> {result, Result};