X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_minichat_conversation.erl;fp=modules%2Ferl%2Feuphorik_minichat_conversation.erl;h=8cddd03f10eb487b54f211eb0ad658a0e2a753ae;hp=a280e1fd5c499d4ec28603042912730e84e4bdb3;hb=d46b9cc6453803962960373f4adff4e3b89b5b4d;hpb=2233e8f8760b118c3cacf541ef32ea456a8e1527

diff --git a/modules/erl/euphorik_minichat_conversation.erl b/modules/erl/euphorik_minichat_conversation.erl
index a280e1f..8cddd03 100755
--- 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]).
--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]).
   
@@ -36,7 +36,6 @@ conversations(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) ->
@@ -51,14 +50,11 @@ conversations(Racines, N, D, P) ->
          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
          ),
-         %io:format("Conversations_mises_en_forme = ~p~n", [Conversations_mises_en_forme]),
          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) ->
-         case euphorik_minichat:message_by_id(Id) of
+         case euphorik_bd:message_by_id(Id) of
             {ok, Message} ->
                [{Message, parents(Id)} | Acc];
             _ ->