projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MOD cleanage du code
[euphorik.git]
/
modules
/
erl
/
euphorik_minichat_conversation.erl
diff --git
a/modules/erl/euphorik_minichat_conversation.erl
b/modules/erl/euphorik_minichat_conversation.erl
index
a280e1f
..
8cddd03
100755
(executable)
--- a/
modules/erl/euphorik_minichat_conversation.erl
+++ b/
modules/erl/euphorik_minichat_conversation.erl
@@
-17,7
+17,7
@@
-include_lib("stdlib/include/qlc.hrl").
-import(lists, [reverse/1, any/2, map/2, sublist/3, filter/2]).
-include_lib("stdlib/include/qlc.hrl").
-import(lists, [reverse/1, any/2, map/2, sublist/3, filter/2]).
--import(euphorik_
minichat
, [resultat_transaction/1]).
+-import(euphorik_
bd
, [resultat_transaction/1]).
-import(qlc, [e/1, q/1, keysort/3]).
-import(mnesia, [table/1, transaction/1]).
-import(qlc, [e/1, q/1, keysort/3]).
-import(mnesia, [table/1, transaction/1]).
@@
-36,7
+36,6
@@
conversations(Racines, N, D, P) ->
_ ->
% demande des conversations
Conversations = conversations_detailees(Racines, N, D, P),
_ ->
% demande des conversations
Conversations = conversations_detailees(Racines, N, D, P),
- %io:format("Conversations : ~p~n", [Conversations]),
% si les conversations sont vides alors on attend un nouveau message
Vide = not any(
fun(C) ->
% si les conversations sont vides alors on attend un nouveau message
Vide = not any(
fun(C) ->
@@
-51,14
+50,11
@@
conversations(Racines, N, D, P) ->
Conversations_mises_en_forme = mise_en_forme_conversations(
if Vide ->
attend_nouveau_message(),
Conversations_mises_en_forme = mise_en_forme_conversations(
if Vide ->
attend_nouveau_message(),
- %io:format("Racines = ~p, N = ~p, D = ~p, P = ~p~n", [Racines, N, D, P]),
- %io:format("Conversations = ~p~n", [conversations_detailees(Racines, N, D, P)]),
conversations_detailees(Racines, N, D, P);
true ->
Conversations
end
),
conversations_detailees(Racines, N, D, P);
true ->
Conversations
end
),
- %io:format("Conversations_mises_en_forme = ~p~n", [Conversations_mises_en_forme]),
unsubscribe(minichat),
Conversations_mises_en_forme
end.
unsubscribe(minichat),
Conversations_mises_en_forme
end.
@@
-119,7
+115,7
@@
mise_en_forme_conversations([{Principale, Plus_principale} | Conversations]) ->
mise_en_forme_conversation(Messages) ->
lists:foldr(
fun(Id, Acc) ->
mise_en_forme_conversation(Messages) ->
lists:foldr(
fun(Id, Acc) ->
- case euphorik_
minichat
:message_by_id(Id) of
+ case euphorik_
bd
:message_by_id(Id) of
{ok, Message} ->
[{Message, parents(Id)} | Acc];
_ ->
{ok, Message} ->
[{Message, parents(Id)} | Acc];
_ ->