MOD avancement sur les conversations (on s'approche du but..)

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

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 35bf993..8fad0e9 100755 (executable)
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -112,13 +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,
-            Conversations = case xmerl_xpath:string("conversations", Action) of
-               Conversations ->
-                  % extraction de chaque conversation
-                  
-               _ -> []
-            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
@@ -158,14 +161,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)
-            ),\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
@@ -203,7 +207,7 @@ refreshMessage(Action) ->
                         ]
                      }\r
                   end,            
-                  euphorik_minichat_conversation:conversations(Conversations, Nb_message, Dernier_id, Page)\r
+                  euphorik_minichat_conversation:conversations(User#user.conversations, Nb_message, Dernier_id, Page)\r
                )
             }];
          _ ->
@@ -299,8 +303,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
+      )
    }].