PubSub/PEP API change for major optimization

SVN Revision: 2048

1 files changed, 61 insertions, 61 deletions

diff --git a/src/mod_pubsub/node.template b/src/mod_pubsub/node.template
index 536f1775b..3879266a9 100644
--- a/src/mod_pubsub/node.template
+++ b/src/mod_pubsub/node.template
@@ -42,29 +42,29 @@
 -export([init/3, terminate/2,
 	 options/0, features/0,
 	 create_node_permission/6,
-	 create_node/3,
-	 delete_node/2,
-	 purge_node/3,
-	 subscribe_node/8,
-	 unsubscribe_node/5,
-	 publish_item/7,
-	 delete_item/4,
-	 remove_extra_items/4,
+	 create_node/2,
+	 delete_node/1,
+	 purge_node/2,
+	 subscribe_node/7,
+	 unsubscribe_node/4,
+	 publish_item/6,
+	 delete_item/3,
+	 remove_extra_items/3,
 	 get_entity_affiliations/2,
-	 get_node_affiliations/2,
-	 get_affiliation/3,
-	 set_affiliation/4,
+	 get_node_affiliations/1,
+	 get_affiliation/2,
+	 set_affiliation/3,
 	 get_entity_subscriptions/2,
-	 get_node_subscriptions/2,
-	 get_subscription/3,
-	 set_subscription/4,
-	 get_states/2,
-	 get_state/3,
+	 get_node_subscriptions/1,
+	 get_subscription/2,
+	 set_subscription/3,
+	 get_states/1,
+	 get_state/2,
 	 set_state/1,
-	 get_items/7,
-	 get_items/3,
-	 get_item/8,
-	 get_item/3,
+	 get_items/6,
+	 get_items/2,
+	 get_item/7,
+	 get_item/2,
 	 set_item/1
 	]).
 
@@ -88,7 +88,7 @@ options() ->
      {roster_groups_allowed, []},
      {publish_model, publishers},
      {max_payload_size, ?MAX_PAYLOAD_SIZE},
-     {send_last_published_item, never},
+     {send_last_published_item, on_sub_and_presence},
      {deliver_notifications, true},
      {presence_based_delivery, false}].
 
@@ -112,74 +112,74 @@ features() ->
 create_node_permission(Host, ServerHost, Node, ParentNode, Owner, Access) ->
     node_default:create_node_permission(Host, ServerHost, Node, ParentNode, Owner, Access).
 
-create_node(Host, Node, Owner) ->
-    node_default:create_node(Host, Node, Owner).
+create_node(NodeId, Owner) ->
+    node_default:create_node(NodeId, Owner).
 
-delete_node(Host, Removed) ->
-    node_default:delete_node(Host, Removed).
+delete_node(Removed) ->
+    node_default:delete_node(Removed).
 
-subscribe_node(Host, Node, Sender, Subscriber, AccessModel, SendLast, PresenceSubscription, RosterGroup) ->
-    node_default:subscribe_node(Host, Node, Sender, Subscriber, AccessModel, SendLast, PresenceSubscription, RosterGroup).
+subscribe_node(NodeId, Sender, Subscriber, AccessModel, SendLast, PresenceSubscription, RosterGroup) ->
+    node_default:subscribe_node(NodeId, Sender, Subscriber, AccessModel, SendLast, PresenceSubscription, RosterGroup).
 
-unsubscribe_node(Host, Node, Sender, Subscriber, SubID) ->
-    node_default:unsubscribe_node(Host, Node, Sender, Subscriber, SubID).
+unsubscribe_node(NodeId, Sender, Subscriber, SubID) ->
+    node_default:unsubscribe_node(NodeId, Sender, Subscriber, SubID).
 
-publish_item(Host, Node, Publisher, Model, MaxItems, ItemId, Payload) ->
-    node_default:publish_item(Host, Node, Publisher, Model, MaxItems, ItemId, Payload).
+publish_item(NodeId, Publisher, Model, MaxItems, ItemId, Payload) ->
+    node_default:publish_item(NodeId, Publisher, Model, MaxItems, ItemId, Payload).
 
-remove_extra_items(Host, Node, MaxItems, ItemIds) ->
-    node_default:remove_extra_items(Host, Node, MaxItems, ItemIds).
+remove_extra_items(NodeId, MaxItems, ItemIds) ->
+    node_default:remove_extra_items(NodeId, MaxItems, ItemIds).
 
-delete_item(Host, Node, JID, ItemId) ->
-    node_default:delete_item(Host, Node, JID, ItemId).
+delete_item(NodeId, JID, ItemId) ->
+    node_default:delete_item(NodeId, JID, ItemId).
 
-purge_node(Host, Node, Owner) ->
-    node_default:purge_node(Host, Node, Owner).
+purge_node(NodeId, Owner) ->
+    node_default:purge_node(NodeId, Owner).
 
 get_entity_affiliations(Host, Owner) ->
     node_default:get_entity_affiliations(Host, Owner).
 
-get_node_affiliations(Host, Node) ->
-    node_default:get_node_affiliations(Host, Node).
+get_node_affiliations(NodeId) ->
+    node_default:get_node_affiliations(NodeId).
 
-get_affiliation(Host, Node, Owner) ->
-    node_default:get_affiliation(Host, Node, Owner).
+get_affiliation(NodeId, Owner) ->
+    node_default:get_affiliation(NodeId, Owner).
 
-set_affiliation(Host, Node, Owner, Affiliation) ->
-    node_default:set_affiliation(Host, Node, Owner, Affiliation).
+set_affiliation(NodeId, Owner, Affiliation) ->
+    node_default:set_affiliation(NodeId, Owner, Affiliation).
 
 get_entity_subscriptions(Host, Owner) ->
     node_default:get_entity_subscriptions(Host, Owner).
 
-get_node_subscriptions(Host, Node) ->
-    node_default:get_node_subscriptions(Host, Node).
+get_node_subscriptions(NodeId) ->
+    node_default:get_node_subscriptions(NodeId).
 
-get_subscription(Host, Node, Owner) ->
-    node_default:get_subscription(Host, Node, Owner).
+get_subscription(NodeId, Owner) ->
+    node_default:get_subscription(NodeId, Owner).
 
-set_subscription(Host, Node, Owner, Subscription) ->
-    node_default:set_subscription(Host, Node, Owner, Subscription).
+set_subscription(NodeId, Owner, Subscription) ->
+    node_default:set_subscription(NodeId, Owner, Subscription).
 
-get_states(Host, Node) ->
-    node_default:get_states(Host, Node).
+get_states(NodeId) ->
+    node_default:get_states(NodeId).
 
-get_state(Host, Node, JID) ->
-    node_default:get_state(Host, Node, JID).
+get_state(NodeId, JID) ->
+    node_default:get_state(NodeId, JID).
 
 set_state(State) ->
     node_default:set_state(State).
 
-get_items(Host, Node, From) ->
-    node_default:get_items(Host, Node, From).
+get_items(NodeId, From) ->
+    node_default:get_items(NodeId, From).
 
-get_items(Host, Node, JID, AccessModel, PresenceSubscription, RosterGroup, SubId)
-    node_default:get_items(Host, Node, JID, AccessModel, PresenceSubscription, RosterGroup, SubId).
+get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, SubId)
+    node_default:get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, SubId).
     
-get_item(Host, Node, ItemId) ->
-    node_default:get_item(Host, Node, ItemId).
+get_item(NodeId, ItemId) ->
+    node_default:get_item(NodeId, ItemId).
 
-get_item(Host, Node, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, SubId) ->
-    node_default:get_item(Host, Node, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, SubId).
+get_item(NodeId, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, SubId) ->
+    node_default:get_item(NodeId, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, SubId).
     
 set_item(Item) ->
     node_default:set_item(Item).