Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

* src/mod_pubsub/mod_pubsub.erl: Fix update pubsub tables from

Browse Source 
ejabberd 1.x to 2.x (EJAB-817)

SVN Revision: 1734
This commit is contained in:
Badlop 2008-12-16 17:44:48 +00:00
parent 867ce5be32
commit 8f43867091
2 changed files with 62 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2008-12-16 Badlop <badlop@process-one.net> 2008-12-16 Badlop <badlop@process-one.net>
* src/mod_pubsub/mod_pubsub.erl: Fix update pubsub tables from
ejabberd 1.x to 2.x (EJAB-817)
* doc/guide.tex: Fix capitalization of some section titles * doc/guide.tex: Fix capitalization of some section titles
* doc/guide.tex: Mention as optional Requirements: mysql, pgsql * doc/guide.tex: Mention as optional Requirements: mysql, pgsql

18
src/mod_pubsub/mod_pubsub.erl
View File

@ -241,7 +241,6 @@ update_database(Host) ->
[host_node, host_parent, info] -> [host_node, host_parent, info] ->
?INFO_MSG("upgrade pubsub tables",[]), ?INFO_MSG("upgrade pubsub tables",[]),
F = fun() -> F = fun() ->
NewRecords =
lists:foldl( lists:foldl(
fun({pubsub_node, NodeId, ParentId, {nodeinfo, Items, Options, Entities}}, RecList) -> fun({pubsub_node, NodeId, ParentId, {nodeinfo, Items, Options, Entities}}, RecList) ->
ItemsList = ItemsList =
@ -285,16 +284,23 @@ update_database(Host) ->
RecList] RecList]
end, [], end, [],
mnesia:match_object( mnesia:match_object(
{pubsub_node, {Host, '_'}, '_', '_'})), {pubsub_node, {Host, '_'}, '_', '_'}))
mnesia:delete_table(pubsub_node), end,
mnesia:create_table(pubsub_node, {atomic, NewRecords} = mnesia:transaction(F),
{atomic, ok} = mnesia:delete_table(pubsub_node),
{atomic, ok} = mnesia:create_table(pubsub_node,
[{disc_copies, [node()]}, [{disc_copies, [node()]},
{attributes, record_info(fields, pubsub_node)}]), {attributes, record_info(fields, pubsub_node)}]),
lists:foreach(fun(Record) -> FNew = fun() -> lists:foreach(fun(Record) ->
mnesia:write(Record) mnesia:write(Record)
end, NewRecords) end, NewRecords)
end, end,
mnesia:transaction(F); case mnesia:transaction(FNew) of
{atomic, Result} ->
?INFO_MSG("Pubsub tables updated correctly: ~p", [Result]);
{aborted, Reason} ->
?ERROR_MSG("Problem updating Pubsub tables:~n~p", [Reason])
end;
_ -> _ ->
ok ok
end. end.