diff options
Diffstat (limited to 'src/nodetree_tree.erl')
| -rw-r--r-- | src/nodetree_tree.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nodetree_tree.erl b/src/nodetree_tree.erl index e3f7e251e..69b50ff9f 100644 --- a/src/nodetree_tree.erl +++ b/src/nodetree_tree.erl @@ -74,15 +74,15 @@ get_node(Host, Node, _From) -> get_node(Host, Node). get_node(Host, Node) -> - case catch mnesia:read({pubsub_node, {Host, Node}}) of + case mnesia:read({pubsub_node, {Host, Node}}) of [Record] when is_record(Record, pubsub_node) -> Record; - _ -> {error, ?ERR_ITEM_NOT_FOUND} + _ -> {error, ?ERRT_ITEM_NOT_FOUND(?MYLANG, <<"Node not found">>)} end. get_node(Nidx) -> - case catch mnesia:index_read(pubsub_node, Nidx, #pubsub_node.id) of + case mnesia:index_read(pubsub_node, Nidx, #pubsub_node.id) of [Record] when is_record(Record, pubsub_node) -> Record; - _ -> {error, ?ERR_ITEM_NOT_FOUND} + _ -> {error, ?ERRT_ITEM_NOT_FOUND(?MYLANG, <<"Node not found">>)} end. get_nodes(Host, _From) -> @@ -147,7 +147,7 @@ get_subnodes_tree(Host, Node) -> create_node(Host, Node, Type, Owner, Options, Parents) -> BJID = jid:tolower(jid:remove_resource(Owner)), - case catch mnesia:read({pubsub_node, {Host, Node}}) of + case mnesia:read({pubsub_node, {Host, Node}}) of [] -> ParentExists = case Host of {_U, _S, _R} -> @@ -160,7 +160,7 @@ create_node(Host, Node, Type, Owner, Options, Parents) -> true; [Parent | _] -> case catch mnesia:read({pubsub_node, {Host, Parent}}) of - [#pubsub_node{owners = [{[], Host, []}]}] -> + [#pubsub_node{owners = [{<<>>, Host, <<>>}]}] -> true; [#pubsub_node{owners = Owners}] -> lists:member(BJID, Owners); @@ -183,7 +183,7 @@ create_node(Host, Node, Type, Owner, Options, Parents) -> {error, ?ERR_FORBIDDEN} end; _ -> - {error, ?ERR_CONFLICT} + {error, ?ERRT_CONFLICT(?MYLANG, <<"Node already exists">>)} end. delete_node(Host, Node) -> |