Accumulated patch to binarize and indent code

1 files changed, 65 insertions, 86 deletions

diff --git a/src/mod_pubsub/node_buddy.erl b/src/mod_pubsub/node_buddy.erl
index d3abc638..23269b1e 100644
--- a/src/mod_pubsub/node_buddy.erl
+++ b/src/mod_pubsub/node_buddy.erl
@@ -5,11 +5,13 @@
 %%% Erlang Public License along with this software. If not, it can be
 %%% retrieved via the world wide web at http://www.erlang.org/.
 %%% 
+%%%
 %%% Software distributed under the License is distributed on an "AS IS"
 %%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %%% the License for the specific language governing rights and limitations
 %%% under the License.
 %%% 
+%%%
 %%% The Initial Developer of the Original Code is ProcessOne.
 %%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne
 %%% All Rights Reserved.''
@@ -24,9 +26,11 @@
 %%% ====================================================================
 
 -module(node_buddy).
+
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
+
 -include("jlib.hrl").
 
 -behaviour(gen_pubsub_node).
@@ -40,39 +44,18 @@
 %%   (this makes code cleaner, but execution a little bit longer)
 
 %% API definition
--export([init/3, terminate/2,
-	 options/0, features/0,
-	 create_node_permission/6,
-	 create_node/2,
-	 delete_node/1,
-	 purge_node/2,
-	 subscribe_node/8,
-	 unsubscribe_node/4,
-	 publish_item/6,
-	 delete_item/4,
-	 remove_extra_items/3,
-	 get_entity_affiliations/2,
-	 get_node_affiliations/1,
-	 get_affiliation/2,
-	 set_affiliation/3,
-	 get_entity_subscriptions/2,
-	 get_node_subscriptions/1,
-	 get_subscriptions/2,
-	 set_subscriptions/4,
-	 get_pending_nodes/2,
-	 get_states/1,
-	 get_state/2,
-	 set_state/1,
-	 get_items/6,
-	 get_items/2,
-	 get_item/7,
-	 get_item/2,
-	 set_item/1,
-	 get_item_name/3,
-	 node_to_path/1,
-	 path_to_node/1
-	]).
-
+-export([init/3, terminate/2, options/0, features/0,
+	 create_node_permission/6, create_node/2, delete_node/1,
+	 purge_node/2, subscribe_node/8, unsubscribe_node/4,
+	 publish_item/6, delete_item/4, remove_extra_items/3,
+	 get_entity_affiliations/2, get_node_affiliations/1,
+	 get_affiliation/2, set_affiliation/3,
+	 get_entity_subscriptions/2, get_node_subscriptions/1,
+	 get_subscriptions/2, set_subscriptions/4,
+	 get_pending_nodes/2, get_states/1, get_state/2,
+	 set_state/1, get_items/6, get_items/2, get_item/7,
+	 get_item/2, set_item/1, get_item_name/3, node_to_path/1,
+	 path_to_node/1]).
 
 init(Host, ServerHost, Opts) ->
     node_hometree:init(Host, ServerHost, Opts).
@@ -81,16 +64,11 @@ terminate(Host, ServerHost) ->
     node_hometree:terminate(Host, ServerHost).
 
 options() ->
-    [{deliver_payloads, true},
-     {notify_config, false},
-     {notify_delete, false},
-     {notify_retract, true},
-     {purge_offline, false},
-     {persist_items, true},
-     {max_items, ?MAXITEMS},
-     {subscribe, true},
-     {access_model, presence},
-     {roster_groups_allowed, []},
+    [{deliver_payloads, true}, {notify_config, false},
+     {notify_delete, false}, {notify_retract, true},
+     {purge_offline, false}, {persist_items, true},
+     {max_items, ?MAXITEMS}, {subscribe, true},
+     {access_model, presence}, {roster_groups_allowed, []},
      {publish_model, publishers},
      {notification_type, headline},
      {max_payload_size, ?MAX_PAYLOAD_SIZE},
@@ -99,25 +77,18 @@ options() ->
      {presence_based_delivery, false}].
 
 features() ->
-    ["create-nodes",
-     "delete-nodes",
-     "delete-items",
-     "instant-nodes",
-     "item-ids",
-     "outcast-affiliation",
-     "persistent-items",
-     "publish",
-     "purge-nodes",
-     "retract-items",
-     "retrieve-affiliations",
-     "retrieve-items",
-     "retrieve-subscriptions",
-     "subscribe",
-     "subscription-notifications"
-    ].
-
-create_node_permission(Host, ServerHost, Node, ParentNode, Owner, Access) ->
-    node_hometree:create_node_permission(Host, ServerHost, Node, ParentNode, Owner, Access).
+    [<<"create-nodes">>, <<"delete-nodes">>,
+     <<"delete-items">>, <<"instant-nodes">>, <<"item-ids">>,
+     <<"outcast-affiliation">>, <<"persistent-items">>,
+     <<"publish">>, <<"purge-nodes">>, <<"retract-items">>,
+     <<"retrieve-affiliations">>, <<"retrieve-items">>,
+     <<"retrieve-subscriptions">>, <<"subscribe">>,
+     <<"subscription-notifications">>].
+
+create_node_permission(Host, ServerHost, Node,
+		       ParentNode, Owner, Access) ->
+    node_hometree:create_node_permission(Host, ServerHost,
+					 Node, ParentNode, Owner, Access).
 
 create_node(NodeId, Owner) ->
     node_hometree:create_node(NodeId, Owner).
@@ -125,20 +96,28 @@ create_node(NodeId, Owner) ->
 delete_node(Removed) ->
     node_hometree:delete_node(Removed).
 
-subscribe_node(NodeId, Sender, Subscriber, AccessModel, SendLast, PresenceSubscription, RosterGroup, Options) ->
-    node_hometree:subscribe_node(NodeId, Sender, Subscriber, AccessModel, SendLast, PresenceSubscription, RosterGroup, Options).
+subscribe_node(NodeId, Sender, Subscriber, AccessModel,
+	       SendLast, PresenceSubscription, RosterGroup, Options) ->
+    node_hometree:subscribe_node(NodeId, Sender, Subscriber,
+				 AccessModel, SendLast, PresenceSubscription,
+				 RosterGroup, Options).
 
 unsubscribe_node(NodeId, Sender, Subscriber, SubID) ->
-    node_hometree:unsubscribe_node(NodeId, Sender, Subscriber, SubID).
+    node_hometree:unsubscribe_node(NodeId, Sender,
+				   Subscriber, SubID).
 
-publish_item(NodeId, Publisher, Model, MaxItems, ItemId, Payload) ->
-    node_hometree:publish_item(NodeId, Publisher, Model, MaxItems, ItemId, Payload).
+publish_item(NodeId, Publisher, Model, MaxItems, ItemId,
+	     Payload) ->
+    node_hometree:publish_item(NodeId, Publisher, Model,
+			       MaxItems, ItemId, Payload).
 
 remove_extra_items(NodeId, MaxItems, ItemIds) ->
-    node_hometree:remove_extra_items(NodeId, MaxItems, ItemIds).
+    node_hometree:remove_extra_items(NodeId, MaxItems,
+				     ItemIds).
 
 delete_item(NodeId, Publisher, PublishModel, ItemId) ->
-    node_hometree:delete_item(NodeId, Publisher, PublishModel, ItemId).
+    node_hometree:delete_item(NodeId, Publisher,
+			      PublishModel, ItemId).
 
 purge_node(NodeId, Owner) ->
     node_hometree:purge_node(NodeId, Owner).
@@ -153,7 +132,8 @@ get_affiliation(NodeId, Owner) ->
     node_hometree:get_affiliation(NodeId, Owner).
 
 set_affiliation(NodeId, Owner, Affiliation) ->
-    node_hometree:set_affiliation(NodeId, Owner, Affiliation).
+    node_hometree:set_affiliation(NodeId, Owner,
+				  Affiliation).
 
 get_entity_subscriptions(Host, Owner) ->
     node_hometree:get_entity_subscriptions(Host, Owner).
@@ -165,41 +145,40 @@ get_subscriptions(NodeId, Owner) ->
     node_hometree:get_subscriptions(NodeId, Owner).
 
 set_subscriptions(NodeId, Owner, Subscription, SubId) ->
-    node_hometree:set_subscriptions(NodeId, Owner, Subscription, SubId).
+    node_hometree:set_subscriptions(NodeId, Owner,
+				    Subscription, SubId).
 
 get_pending_nodes(Host, Owner) ->
     node_hometree:get_pending_nodes(Host, Owner).
 
-get_states(NodeId) ->
-    node_hometree:get_states(NodeId).
+get_states(NodeId) -> node_hometree:get_states(NodeId).
 
 get_state(NodeId, JID) ->
     node_hometree:get_state(NodeId, JID).
 
-set_state(State) ->
-    node_hometree:set_state(State).
+set_state(State) -> node_hometree:set_state(State).
 
 get_items(NodeId, From) ->
     node_hometree:get_items(NodeId, From).
 
-get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, SubId) ->
-    node_hometree:get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, SubId).
+get_items(NodeId, JID, AccessModel,
+	  PresenceSubscription, RosterGroup, SubId) ->
+    node_hometree:get_items(NodeId, JID, AccessModel,
+			    PresenceSubscription, RosterGroup, SubId).
 
 get_item(NodeId, ItemId) ->
     node_hometree:get_item(NodeId, ItemId).
 
-get_item(NodeId, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, SubId) ->
-    node_hometree:get_item(NodeId, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, SubId).
+get_item(NodeId, ItemId, JID, AccessModel,
+	 PresenceSubscription, RosterGroup, SubId) ->
+    node_hometree:get_item(NodeId, ItemId, JID, AccessModel,
+			   PresenceSubscription, RosterGroup, SubId).
 
-set_item(Item) ->
-    node_hometree:set_item(Item).
+set_item(Item) -> node_hometree:set_item(Item).
 
 get_item_name(Host, Node, Id) ->
     node_hometree:get_item_name(Host, Node, Id).
 
-node_to_path(Node) ->
-    node_flat:node_to_path(Node).
-
-path_to_node(Path) ->
-    node_flat:path_to_node(Path).
+node_to_path(Node) -> node_flat:node_to_path(Node).
 
+path_to_node(Path) -> node_flat:path_to_node(Path).