diff options
Diffstat (limited to 'src/nodetree_virtual.erl')
| -rw-r--r-- | src/nodetree_virtual.erl | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/nodetree_virtual.erl b/src/nodetree_virtual.erl index 934950dd2..627eca092 100644 --- a/src/nodetree_virtual.erl +++ b/src/nodetree_virtual.erl @@ -5,7 +5,7 @@ %%% Created : 1 Dec 2007 by Christophe Romain <christophe.romain@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2016 ProcessOne +%%% ejabberd, Copyright (C) 2002-2019 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -35,7 +35,6 @@ -author('christophe.romain@process-one.net'). -include("pubsub.hrl"). --include("jlib.hrl"). -export([init/3, terminate/2, options/0, set_node/1, get_node/3, get_node/2, get_node/1, get_nodes/2, @@ -66,10 +65,10 @@ get_node(Nidx) -> {Host, Node} = nodeid(Nidx), node_record(Host, Node, Nidx). -get_nodes(Host, _From) -> - get_nodes(Host). +get_nodes(Host) -> + get_nodes(Host, infinity). -get_nodes(_Host) -> +get_nodes(_Host, _Limit) -> []. get_parentnodes(_Host, _Node, _From) -> @@ -78,10 +77,7 @@ get_parentnodes(_Host, _Node, _From) -> get_parentnodes_tree(Host, Node, From) -> [{0, [get_node(Host, Node, From)]}]. -get_subnodes(Host, Node, _From) -> - get_subnodes(Host, Node). - -get_subnodes(_Host, _Node) -> +get_subnodes(_Host, _Node, _From) -> []. get_subnodes_tree(Host, Node, _From) -> @@ -113,13 +109,13 @@ node_record(Host, Node, Nidx) -> options = Module:options()}. nodeidx({U,S,R}, Node) -> - JID = jid:to_string(jid:make(U,S,R)), + JID = jid:encode(jid:make(U,S,R)), <<JID/binary, ":", Node/binary>>; nodeidx(Host, Node) -> <<Host/binary, ":", Node/binary>>. nodeid(Nidx) -> [Head, Node] = binary:split(Nidx, <<":">>), - case jid:from_string(Head) of + case jid:decode(Head) of {jid,<<>>,Host,<<>>,_,_,_} -> {Host, Node}; {jid,U,S,R,_,_,_} -> {{U,S,R}, Node} end. |