MOD fin du système de page et cleanage du code

[euphorik.git] / modules / erl / euphorik_protocole.erl

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 2f4a5a3..251d4c1 100755 (executable)
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -8,8 +8,8 @@
 
 -module(euphorik_protocole).
 -export([
-   generation_captcha/1,
-   nouveau_user_captcha/1,
+   %generation_captcha/1, Obsolète
+   %nouveau_user_captcha/1, Obsolète
    nouveau_user_login/1,
    login/1,
    logout/1,
@@ -112,7 +112,16 @@ profile(Action) ->
             Pseudo = case xmerl_xpath:string("pseudo", Action) of [#xmlElement{content = [#xmlText{value = P2}]}] -> P2; _ -> Login end,
             Email = case xmerl_xpath:string("email", Action) of [#xmlElement{content = [#xmlText{value = E}]}] -> E; _ -> undefined end,
             Css = case xmerl_xpath:string("css", Action) of [#xmlElement{content = [#xmlText{value = C}]}] -> C; _ -> undefined end,
-            case euphorik_minichat:set_profile(Cookie, Login, Password, Pseudo, Email, Css) of
+            Page_principale = case xmerl_xpath:string("pagePrincipale", Action) of [#xmlElement{content = [#xmlText{value = P3}]}] -> list_to_integer(P3); _ -> undefined end,
+            Conversations = lists:map(
+               fun(Conv) ->
+                  [#xmlElement{content = [#xmlText{value = Id_racine_str}]}] = xmerl_xpath:string("racine", Conv),
+                  [#xmlElement{content = [#xmlText{value = Page_conv_str}]}] = xmerl_xpath:string("page", Conv), 
+                  {erlang:list_to_integer(Id_racine_str, 36), list_to_integer(Page_conv_str)}
+               end,
+               xmerl_xpath:string("conversation", Action)
+            ),
+            case euphorik_minichat:set_profile(Cookie, Login, Password, Pseudo, Email, Css, Page_principale, Conversations) of
                ok ->
                   xml_reponse_profile_ok();\r
                login_deja_pris ->\r
@@ -129,16 +138,9 @@ profile(Action) ->
 % Renvoie les messages appropriés.
 refreshMessage(Action) ->\r
    simple_xml_to_string(
-      case {
-         xmerl_xpath:string("nombreMessage", Action), % le nombre de message qu'affiche le client
-         xmerl_xpath:string("page", Action) % la page désiré, la première (les derniers messages) étant la 1
-         } of
-         {
-            [#xmlElement{content = [#xmlText{value = Nb_message_str}]}],
-            [#xmlElement{content = [#xmlText{value = Page_str}]}]
-         } ->         
+      case xmerl_xpath:string("nombreMessage", Action) of % le nombre de message qu'affiche le client
+         [#xmlElement{content = [#xmlText{value = Nb_message_str}]}] ->         
             Nb_message = list_to_integer(Nb_message_str),
-            Page = list_to_integer(Page_str),
             Dernier_id = case xmerl_xpath:string("dernierMessageId", Action) of % l'id du dernier message que connait le client
                [#xmlElement{content = [#xmlText{value = D}]}] -> erlang:list_to_integer(D, 36);
                _ -> 0
@@ -152,16 +154,15 @@ refreshMessage(Action) ->
                _ -> inconnu
             end,
             % extraction des conversations en [{id, page}, ..]
-            Conversations = lists:map(
-               fun(Conv) ->
-                  [#xmlElement{content = [#xmlText{value = Id_racine_str}]}] = xmerl_xpath:string("racine", Conv),
-                  [#xmlElement{content = [#xmlText{value = Page_conv_str}]}] = xmerl_xpath:string("page", Conv), 
-                  {erlang:list_to_integer(Id_racine_str, 36), erlang:list_to_integer(Page_conv_str)}
-               end,
-               xmerl_xpath:string("conversation", Action)
-            ),
-            Poulpe = euphorik_minichat_conversation:conversations(Conversations, Nb_message, Dernier_id, Page),
-            io:format("Poulpe = ~p~n", [Poulpe]),\r
+            % Obsolète : obtenu depuis la table 'user'
+            %~ Conversations = lists:map(
+               %~ fun(Conv) ->
+                  %~ [#xmlElement{content = [#xmlText{value = Id_racine_str}]}] = xmerl_xpath:string("racine", Conv),
+                  %~ [#xmlElement{content = [#xmlText{value = Page_conv_str}]}] = xmerl_xpath:string("page", Conv), 
+                  %~ {erlang:list_to_integer(Id_racine_str, 36), erlang:list_to_integer(Page_conv_str)}
+               %~ end,
+               %~ xmerl_xpath:string("conversation", Action)
+            %~ ),\r
             % accrochez-vous ca va siouxer ;)
             [{reponse, [{name, "refreshMessages"}],\r
                lists:map(\r
@@ -198,8 +199,8 @@ refreshMessage(Action) ->
                            )
                         ]
                      }\r
-                  end,               
-                  Poulpe\r
+                  end,
+                  euphorik_minichat_conversation:conversations(User#user.conversations, Nb_message, Dernier_id, User#user.page_principale)\r
                )
             }];
          _ ->
@@ -281,7 +282,6 @@ format_date(Date) ->
 
 %%%%%%%%% <Réponses XML> %%%%%%%%%
 simple_xml_to_string(XML) ->
-   io:format("~p~n", [XML]),
    lists:flatten(xmerl:export_simple(XML, xmerl_xml, [{prolog, ["<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"]}])).
 
 
@@ -296,8 +296,20 @@ xml_reponse_login_ok(User) ->
          {pseudo, [User#user.pseudo]},
          {login, [User#user.login]},
          {email, [User#user.email]},
-         {css, [User#user.css]}
-      ]
+         {css, [User#user.css]},
+         {pagePrincipale, [integer_to_list(User#user.page_principale)]}
+      ] ++ 
+      lists:map(
+         fun(C) -> 
+            {conversation, 
+               [
+                  {racine, [erlang:integer_to_list(element(1, C), 36)]},
+                  {page, [integer_to_list(element(2, C))]}
+               ]
+            }
+         end,
+         User#user.conversations
+      )
    }].