remove useless comment
authorChristophe Romain <christophe.romain@process-one.net>
Tue, 12 Jan 2010 15:25:59 +0000 (15:25 +0000)
committerChristophe Romain <christophe.romain@process-one.net>
Tue, 12 Jan 2010 15:25:59 +0000 (15:25 +0000)
SVN Revision: 2888

src/mod_pubsub/mod_pubsub.erl
src/mod_pubsub/mod_pubsub_odbc.erl
src/mod_pubsub/pubsub_odbc.patch

index 70d2bac5081e39a26254548d0af45acb277e15fb..55fb0a208164ca27c13c9c8031bbaf7d64756995 100644 (file)
@@ -3043,24 +3043,6 @@ get_options_for_subs(NodeID, Subs) ->
                        Acc
                end, [], Subs).
 
-% TODO: merge broadcast code that way
-%broadcast(Host, Node, NodeId, Type, NodeOptions, Feature, Force, ElName, SubEls) ->
-%    case (get_option(NodeOptions, Feature) or Force) of
-%      true ->
-%          case node_action(Host, Type, get_node_subscriptions, [NodeId]) of
-%              {result, []} -> 
-%                  {result, false};
-%              {result, Subs} ->
-%                  Stanza = event_stanza([{xmlelement, ElName, nodeAttr(Node), SubEls}]),
-%                  broadcast_stanza(Host, Node, Type, NodeOptions, SubOpts, Stanza),
-%                  {result, true};
-%              _ ->
-%                  {result, false}
-%          end;
-%      _ ->
-%          {result, false}
-%    end
-
 broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM) ->
     NotificationType = get_option(NodeOptions, notification_type, headline),
     BroadcastAll = get_option(NodeOptions, broadcast_all_resources), %% XXX this is not standard, but usefull
index 340b965b42454ecc46a04275fa30df3a5d1f835e..4209a3a43cc51f41ba1c8cfa64b8707d18fdaeac 100644 (file)
@@ -2852,24 +2852,6 @@ get_options_for_subs(NodeID, Subs) ->
                        Acc
                end, [], Subs).
 
-% TODO: merge broadcast code that way
-%broadcast(Host, Node, NodeId, Type, NodeOptions, Feature, Force, ElName, SubEls) ->
-%    case (get_option(NodeOptions, Feature) or Force) of
-%      true ->
-%          case node_action(Host, Type, get_node_subscriptions, [NodeId]) of
-%              {result, []} -> 
-%                  {result, false};
-%              {result, Subs} ->
-%                  Stanza = event_stanza([{xmlelement, ElName, nodeAttr(Node), SubEls}]),
-%                  broadcast_stanza(Host, Node, Type, NodeOptions, SubOpts, Stanza),
-%                  {result, true};
-%              _ ->
-%                  {result, false}
-%          end;
-%      _ ->
-%          {result, false}
-%    end
-
 broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM) ->
     NotificationType = get_option(NodeOptions, notification_type, headline),
     BroadcastAll = get_option(NodeOptions, broadcast_all_resources), %% XXX this is not standard, but usefull
index 402fa0feb9cc636424d355b00c05abd03a3eadc4..1c400d912ca8b2d9f94f662df1138e09a15b1ade 100644 (file)
@@ -1,5 +1,5 @@
---- mod_pubsub.erl     2010-01-12 16:09:01.000000000 +0100
-+++ mod_pubsub_odbc.erl        2010-01-12 16:09:09.000000000 +0100
+--- mod_pubsub.erl     2010-01-12 16:20:07.000000000 +0100
++++ mod_pubsub_odbc.erl        2010-01-12 16:20:19.000000000 +0100
 @@ -42,7 +42,7 @@
  %%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see
  %%% XEP-0060 section 12.18.
                            _ -> Acc
                        end;
                    (_, Acc) ->
-@@ -3264,6 +3073,30 @@
+@@ -3246,6 +3055,30 @@
            Result
      end.
  
  %% @spec (Host, Options) -> MaxItems
  %%     Host = host()
  %%     Options = [Option]
-@@ -3656,7 +3489,13 @@
+@@ -3638,7 +3471,13 @@
  tree_action(Host, Function, Args) ->
      ?DEBUG("tree_action ~p ~p ~p",[Host,Function,Args]),
      Fun = fun() -> tree_call(Host, Function, Args) end,
  
  %% @doc <p>node plugin call.</p>
  node_call(Type, Function, Args) ->
-@@ -3676,13 +3515,13 @@
+@@ -3658,13 +3497,13 @@
  
  node_action(Host, Type, Function, Args) ->
      ?DEBUG("node_action ~p ~p ~p ~p",[Host,Type,Function,Args]),
                        case tree_call(Host, get_node, [Host, Node]) of
                            N when is_record(N, pubsub_node) ->
                                case Action(N) of
-@@ -3695,8 +3534,14 @@
+@@ -3677,8 +3516,14 @@
                        end
                end, Trans).
  
        {result, Result} -> {result, Result};
        {error, Error} -> {error, Error};
        {atomic, {result, Result}} -> {result, Result};
-@@ -3704,6 +3549,15 @@
+@@ -3686,6 +3531,15 @@
        {aborted, Reason} ->
            ?ERROR_MSG("transaction return internal error: ~p~n", [{aborted, Reason}]),
            {error, ?ERR_INTERNAL_SERVER_ERROR};
        {'EXIT', Reason} ->
            ?ERROR_MSG("transaction return internal error: ~p~n", [{'EXIT', Reason}]),
            {error, ?ERR_INTERNAL_SERVER_ERROR};
-@@ -3712,6 +3566,17 @@
+@@ -3694,6 +3548,17 @@
            {error, ?ERR_INTERNAL_SERVER_ERROR}
      end.