Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

get odbc subscriptions bugfix 

SVN Revision: 2554
This commit is contained in:
Christophe Romain 2009-08-27 22:14:48 +00:00
parent 2fdabe8b5b
commit 57aefa240f
5 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod_pubsub/mod_pubsub.erl
View File

@ -2512,8 +2512,7 @@ set_options_helper(Configuration, JID, NodeID, SubID, Type) ->
end.
write_sub(Subscriber, NodeID, SubID, Options) ->
case pubsub_subscription:set_subscription(Subscriber, NodeID, SubID,
Options) of
case pubsub_subscription:set_subscription(Subscriber, NodeID, SubID, Options) of
{error, notfound} ->
{error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")};
{result, _} ->

5
src/mod_pubsub/mod_pubsub_odbc.erl
View File

@ -2289,7 +2289,7 @@ get_options_helper(JID, Lang, NodeID, SubID, Type) ->
read_sub(Subscriber, NodeID, SubID, Lang) ->
case pubsub_subscription_odbc:get_subscription(Subscriber, NodeID, SubID) of
{error, notfound} ->
{error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")};
pubsub_subscription_odbc:get_options_xform(Lang, []);
{result, #pubsub_subscription{options = Options}} ->
pubsub_subscription_odbc:get_options_xform(Lang, Options)
end.
@ -2336,8 +2336,7 @@ set_options_helper(Configuration, JID, NodeID, SubID, Type) ->
end.
write_sub(Subscriber, NodeID, SubID, Options) ->
case pubsub_subscription_odbc:set_subscription(Subscriber, NodeID, SubID,
Options) of
case pubsub_subscription_odbc:set_subscription(Subscriber, NodeID, SubID, Options) of
{error, notfound} ->
{error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")};
{result, _} ->

14
src/mod_pubsub/node_hometree_odbc.erl
View File

@ -665,10 +665,18 @@ get_entity_subscriptions(Host, Owner) ->
end,
Reply = case catch ejabberd_odbc:sql_query_t(Query) of
{selected, ["node", "type", "nodeid", "jid", "subscriptions"], RItems} ->
lists:map(fun({N, T, I, J, S}) ->
lists:foldl(fun({N, T, I, J, S}, Acc) ->
Node = nodetree_tree_odbc:raw_to_node(Host, {N, "", T, I}),
{Node, decode_subscriptions(S), decode_jid(J)}
end, RItems);
Jid = decode_jid(J),
case decode_subscriptions(S) of
[] ->
[{Node, none, Jid}|Acc];
Subs ->
lists:foldl(fun({Sub, SubId}, Acc2) -> [{Node, Sub, SubId, Jid}|Acc2];
(Sub, Acc2) -> [{Node, Sub, Jid}|Acc2]
end, Acc, Subs)
end
end, [], RItems);
_ ->
[]
end,

31
src/mod_pubsub/pubsub_odbc.patch
View File

@ -1,5 +1,5 @@
--- mod_pubsub.erl 2009-08-27 23:21:24.000000000 +0200
+++ mod_pubsub_odbc.erl 2009-08-27 23:36:47.000000000 +0200
--- mod_pubsub.erl 2009-08-27 23:47:01.000000000 +0200
+++ mod_pubsub_odbc.erl 2009-08-27 23:56:49.000000000 +0200
@@ -45,7 +45,7 @@
%%% TODO
%%% plugin: generate Reply (do not use broadcast atom anymore)
@ -565,7 +565,8 @@
- case pubsub_subscription:get_subscription(Subscriber, NodeID, SubID) of
+ case pubsub_subscription_odbc:get_subscription(Subscriber, NodeID, SubID) of
{error, notfound} ->
{error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")};
- {error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")};
+ pubsub_subscription_odbc:get_options_xform(Lang, []);
{result, #pubsub_subscription{options = Options}} ->
- pubsub_subscription:get_options_xform(Lang, Options)
+ pubsub_subscription_odbc:get_options_xform(Lang, Options)
@ -585,12 +586,12 @@
end.
write_sub(Subscriber, NodeID, SubID, Options) ->
- case pubsub_subscription:set_subscription(Subscriber, NodeID, SubID,
+ case pubsub_subscription_odbc:set_subscription(Subscriber, NodeID, SubID,
Options) of
- case pubsub_subscription:set_subscription(Subscriber, NodeID, SubID, Options) of
+ case pubsub_subscription_odbc:set_subscription(Subscriber, NodeID, SubID, Options) of
{error, notfound} ->
{error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")};
@@ -2681,8 +2505,8 @@
{result, _} ->
@@ -2680,8 +2504,8 @@
{"subscription", subscription_to_string(Sub)} | nodeAttr(Node)], []}]}]},
ejabberd_router ! {route, service_jid(Host), jlib:make_jid(JID), Stanza}
end,
@ -601,7 +602,7 @@
true ->
Result = lists:foldl(fun({JID, Subscription, SubId}, Acc) ->
@@ -2964,7 +2788,7 @@
@@ -2963,7 +2787,7 @@
{Depth, [{N, get_node_subs(N)} || N <- Nodes]}
end, tree_call(Host, get_parentnodes_tree, [Host, Node, service_jid(Host)]))}
end,
@ -610,7 +611,7 @@
{result, CollSubs} -> CollSubs;
_ -> []
end.
@@ -2978,9 +2802,9 @@
@@ -2977,9 +2801,9 @@
get_options_for_subs(NodeID, Subs) ->
lists:foldl(fun({JID, subscribed, SubID}, Acc) ->
@ -622,7 +623,7 @@
_ -> Acc
end;
(_, Acc) ->
@@ -3174,6 +2998,30 @@
@@ -3173,6 +2997,30 @@
Result
end.
@ -653,7 +654,7 @@
%% @spec (Host, Options) -> MaxItems
%% Host = host()
%% Options = [Option]
@@ -3547,7 +3395,13 @@
@@ -3546,7 +3394,13 @@
tree_action(Host, Function, Args) ->
?DEBUG("tree_action ~p ~p ~p",[Host,Function,Args]),
Fun = fun() -> tree_call(Host, Function, Args) end,
@ -668,7 +669,7 @@
%% @doc <p>node plugin call.</p>
node_call(Type, Function, Args) ->
@@ -3567,13 +3421,13 @@
@@ -3566,13 +3420,13 @@
node_action(Host, Type, Function, Args) ->
?DEBUG("node_action ~p ~p ~p ~p",[Host,Type,Function,Args]),
@ -684,7 +685,7 @@
case tree_call(Host, get_node, [Host, Node]) of
N when is_record(N, pubsub_node) ->
case Action(N) of
@@ -3586,8 +3440,14 @@
@@ -3585,8 +3439,14 @@
end
end, Trans).
@ -701,7 +702,7 @@
{result, Result} -> {result, Result};
{error, Error} -> {error, Error};
{atomic, {result, Result}} -> {result, Result};
@@ -3595,6 +3455,15 @@
@@ -3594,6 +3454,15 @@
{aborted, Reason} ->
?ERROR_MSG("transaction return internal error: ~p~n", [{aborted, Reason}]),
{error, ?ERR_INTERNAL_SERVER_ERROR};
@ -717,7 +718,7 @@
{'EXIT', Reason} ->
?ERROR_MSG("transaction return internal error: ~p~n", [{'EXIT', Reason}]),
{error, ?ERR_INTERNAL_SERVER_ERROR};
@@ -3603,6 +3472,17 @@
@@ -3602,6 +3471,17 @@
{error, ?ERR_INTERNAL_SERVER_ERROR}
end.

9
src/mod_pubsub/pubsub_subscription_odbc.erl
View File

@ -87,9 +87,9 @@ init() ->
ok = create_table().
subscribe_node(_JID, _NodeID, Options) ->
SubId = make_subid(),
?DB_MOD:add_subscription(#pubsub_subscription{subid = SubId, options = Options}),
{result, SubId}.
SubID = make_subid(),
?DB_MOD:add_subscription(#pubsub_subscription{subid = SubID, options = Options}),
{result, SubID}.
unsubscribe_node(_JID, _NodeID, SubID) ->
@ -114,7 +114,8 @@ set_subscription(_JID, _NodeID, SubID, Options) ->
?DB_MOD:update_subscription(#pubsub_subscription{subid = SubID, options = Options}),
{result, ok};
notfound ->
{error, notfound}
?DB_MOD:add_subscription(#pubsub_subscription{subid = SubID, options = Options}),
{result, ok}
end.