X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_requests.erl;h=2fb69c0b784a4caae1d71119b55f36a3e2470f14;hp=0e4b04685ce87953a68af9465f6dcad3dd57c932;hb=e04de9d41e7955b0092fc33b8619b4627af6b3f3;hpb=c39e55c505a27e30209fcfb6d837d6ec8a82b990

diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl
index 0e4b046..2fb69c0 100755
--- a/modules/erl/euphorik_requests.erl
+++ b/modules/erl/euphorik_requests.erl
@@ -26,7 +26,7 @@ tester() ->
       "<action name=\"refreshMessages\"><cookie>3FSDCH0FD4ML8WEPN2B5T</cookie>"
       "<nombreMessage>10</nombreMessage>"
       "</action>",
-   io:format("Messages de la premières page : ~p~n", [traiter_xml(XML)]).
+   io:format("Messages de la premières page : ~p~n", [traiter_donnees(XML)]).
    
    %~ traiter_xml("<action name=\"message\">"
       %~ "<cookie>4UDUSY6Z2IZNTQO484S8X</cookie>"
@@ -39,15 +39,30 @@ tester() ->
 out(A) ->
    %inet:setopts(A#arg.clisock, inet:getopts(A#arg.clisock, [active])),
    {value, {_, Contenu}} = lists:keysearch("action", 1, yaws_api:parse_post(A)),
-   Ret = traiter_xml(Contenu),
+   Ret = traiter_donnees(Contenu),
    {content, "text/xml", Ret}.
 
 
-traiter_xml(Contenu) ->
-   {XML, _} = xmerl_scan:string(Contenu),
-   traiter_action(XML#xmlElement.attributes, XML).
-   
-
+traiter_donnees(Contenu) ->
+   case xmerl_scan:string(Contenu) of
+      {XML, _} -> 
+         case XML of
+            #xmlElement{name = json, content = [#xmlText{value = J}|_]} ->
+               case json:decode_string(J) of
+                  {ok, {struct, [{action, Action}| Reste]}} ->
+                     traiter_action(Action, Reste);
+                  _ ->
+                     erreur
+               end;
+            _ ->
+               traiter_action(XML#xmlElement.attributes, XML)
+         end;
+      _ -> erreur
+   end.
+   
+   
+traiter_action("authentification", JSON) ->
+   euphorik_protocole:login(JSON);
 % un client s'enregistre (pseudo + password)
 traiter_action([#xmlAttribute{value="register"}], XML) ->
    euphorik_protocole:nouveau_user_login(XML);