X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=08624ae45e710d97e0224ccb9d51218eb0a8d7cb;hb=221a44d7aeaf467ef9854fe21af93bc964e92ef1;hp=b81f60ae038904043dfd12f57fd4607c02296ad6;hpb=531c70729709cd97024eb1c2ff3ed836db9f550e;p=euphorik.git

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index b81f60a..08624ae 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -17,8 +17,7 @@
    mod_troll/1,
    del_troll/1,
    erreur/1
-]).
-
+]).
 -include_lib("xmerl/include/xmerl.hrl").
 -include("../include/euphorik_bd.hrl").
 -include("../include/euphorik_defines.hrl").
@@ -198,69 +197,69 @@ wait_event(_) ->
 
 
 wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id, Main_page, Troll_id) ->
-   % est-ce qu'il y a des nouveaux messages ?
-   case euphorik_minichat_conversation:conversations(Racines_conversations, Message_count, Last_message_id, Main_page) of
-      vide ->
-         % est-ce que le troll est à jour ?
-         case euphorik_bd:current_troll() of
-            Current when is_record(Current, troll), Current#troll.id =/= Troll_id ->
-               {struct, [
-                  {reply, "new_troll"},
-                  {troll_id, Current#troll.id},
-                  {content, Current#troll.content}
-               ]};
-            _ ->
+   % est-ce que le troll est à jour ?
+   case euphorik_bd:current_troll() of
+      Current when is_record(Current, troll), Current#troll.id =/= Troll_id ->
+         {struct, [
+            {reply, "new_troll"},
+            {troll_id, Current#troll.id},
+            {content, Current#troll.content}
+         ]};
+      _ ->
+         % est-ce qu'il y a des nouveaux messages ?
+         case euphorik_minichat_conversation:conversations(Racines_conversations, Message_count, Last_message_id, Main_page) of
+            vide ->            
                wait_event_bd_page_chat(),
                % TODO : l'appel est-il bien tail-recursive  ?
-               wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id, Main_page, Troll_id)
-         end;
-      Conversations ->
-         % accrochez-vous ca va siouxer ;)
-         {struct, [
-            {reply, "new_messages"},
-            {conversations, {array,
-               lists:map(
-                  fun({Conv, Plus}) ->
-                     {struct, [
-                        {last_page, not Plus},
-                        {messages, {array, 
-                           lists:map(
-                              fun({Mess, Repond_a}) ->                                 
-                                 Est_proprietaire = User =/= inconnu andalso User#user.id =:= Mess#minichat.auteur_id,
-                                 A_repondu_a_message = User =/= inconnu andalso euphorik_bd:a_repondu_a_message(User#user.id, Mess#minichat.id),
-                                 Est_une_reponse_a_user = User =/= inconnu andalso euphorik_bd:est_une_reponse_a_user(User#user.id, Mess#minichat.id),
-                                 {ok, User_mess } = euphorik_bd:user_by_id(Mess#minichat.auteur_id),
-                                 {struct, [
-                                    {id, Mess#minichat.id},
-                                    {user_id, User_mess#user.id},
-                                    {date, format_date(Mess#minichat.date)},
-                                    {system, Mess#minichat.auteur_id =:= 0},
-                                    {owner, Est_proprietaire},
-                                    {answered, A_repondu_a_message},
-                                    {is_a_reply, Est_une_reponse_a_user},
-                                    {nick, Mess#minichat.pseudo},
-                                    {login, User_mess#user.login},
-                                    {content, Mess#minichat.contenu},
-                                    {answer_to, {array, lists:map(
-                                       fun(Id_mess) ->                   
-                                          {ok, M} = euphorik_bd:message_by_id(Id_mess),
-                                          {ok, User_reponse} = euphorik_bd:user_by_mess(M#minichat.id),
-                                          {struct, [{id, M#minichat.id}, {nick, M#minichat.pseudo}, {login, User_reponse#user.login}]}
-                                       end,
-                                       Repond_a
-                                    )}},
-                                    {ek_master, User_mess#user.ek_master}
-                                 ]}
-                              end,
-                              Conv
-                           )
-                        }}
-                     ]}
-                  end,
-                  Conversations
-               )
-            }}
-         ]}
+               wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id, Main_page, Troll_id);
+            Conversations ->
+               % accrochez-vous ca va siouxer ;)
+               {struct, [
+                  {reply, "new_messages"},
+                  {conversations, {array,
+                     lists:map(
+                        fun({Conv, Plus}) ->
+                           {struct, [
+                              {last_page, not Plus},
+                              {messages, {array, 
+                                 lists:map(
+                                    fun({Mess, Repond_a}) ->                                 
+                                       Est_proprietaire = User =/= inconnu andalso User#user.id =:= Mess#minichat.auteur_id,
+                                       A_repondu_a_message = User =/= inconnu andalso euphorik_bd:a_repondu_a_message(User#user.id, Mess#minichat.id),
+                                       Est_une_reponse_a_user = User =/= inconnu andalso euphorik_bd:est_une_reponse_a_user(User#user.id, Mess#minichat.id),
+                                       {ok, User_mess } = euphorik_bd:user_by_id(Mess#minichat.auteur_id),
+                                       {struct, [
+                                          {id, Mess#minichat.id},
+                                          {user_id, User_mess#user.id},
+                                          {date, format_date(Mess#minichat.date)},
+                                          {system, Mess#minichat.auteur_id =:= 0},
+                                          {owner, Est_proprietaire},
+                                          {answered, A_repondu_a_message},
+                                          {is_a_reply, Est_une_reponse_a_user},
+                                          {nick, Mess#minichat.pseudo},
+                                          {login, User_mess#user.login},
+                                          {content, Mess#minichat.contenu},
+                                          {answer_to, {array, lists:map(
+                                             fun(Id_mess) ->                   
+                                                {ok, M} = euphorik_bd:message_by_id(Id_mess),
+                                                {ok, User_reponse} = euphorik_bd:user_by_mess(M#minichat.id),
+                                                {struct, [{id, M#minichat.id}, {nick, M#minichat.pseudo}, {login, User_reponse#user.login}]}
+                                             end,
+                                             Repond_a
+                                          )}},
+                                          {ek_master, User_mess#user.ek_master}
+                                       ]}
+                                    end,
+                                    Conv
+                                 )
+                              }}
+                           ]}
+                        end,
+                        Conversations
+                     )
+                  }}
+               ]}
+         end
    end.
 
 
@@ -271,12 +270,12 @@ wait_event_bd_page_chat() ->
          ok;
       {mnesia_table_event, {write, troll, Troll, [Old_troll | _], _}} when Troll#troll.date_post =/= undefined, Old_troll#troll.date_post == undefined ->
          ok;
-      M ->
-         io:format("M : ~p~n", [M]), %TODO : a virer
+      {tcp_closed, _} ->
+         exit(normal);
+      _ ->
          wait_event_bd_page_chat()
-   % 60 minutes de timeout (le cas ou il n'y a que des consultations et jamais de post)
+   % 60 minutes de timeout (on ne sais jamais)
    % Après 60 minutes de connexion, le client doit donc reétablir une connexion
-   % TODO : pour être mieux : quand le socket se ferme alors un message devrait être envoyé et débloquer ce receive (demande en cours sur la mailing list de yaws)
    after 1000 * 60 * 60 -> 
       timeout
    end.           
@@ -304,7 +303,7 @@ put_message(
                      % TODO : non-atomique (update_pseudo+nouveau_message)
                      euphorik_bd:update_pseudo_user(User#user.id, Nick),
                      case euphorik_bd:nouveau_message(Strip_content, User#user.id, Answer_to) of
-                           erreur -> erreur("Impossible d'ajouter un nouveau message");
+                        {erreur, R} -> erreur("Impossible d'ajouter un nouveau message. Raison : " ++ R);
                         _ ->
                            json_reponse_ok()
                      end
@@ -383,7 +382,8 @@ slap(
                         User1#user.pseudo,
                         if Reason =/= [] -> " - Raison: " ++ Reason; true -> "" end
                      ]
-                  )));
+                  ))),
+                  json_reponse_ok();
                {ok, User2 = #user{ek_master = false}} ->
                   euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("~s se fait slaper par ~s.~s",
                      [