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

diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl
index 9cec43b..2fb69c0 100755
--- a/modules/erl/euphorik_requests.erl
+++ b/modules/erl/euphorik_requests.erl
@@ -14,13 +14,7 @@
 -include_lib("yaws/include/yaws_api.hrl").
 
 % Test du module
-tester() ->
-   %~ {XML, _} = xmerl_scan:string(
-      %~ "<action name=\"loginCaptcha\">"
-      %~ "  <captchaCrypt>b1b1b4e72e6f3d00e477cf37cced5851</captchaCrypt>"
-      %~ "  <captchaInput>LKJDLA</captchaInput>"
-      %~ "</action>"),
-   %~ io:format("Nouvel user : ~p~n", [nouveau_user(XML)]).
+tester() ->
    
    %~ {XML2, _} = xmerl_scan:string(
       %~ "<action name=\"login\">"
@@ -29,20 +23,15 @@ tester() ->
    %~ io:format("Login : ~p~n", [euphorik_protocole:login(XML2)]).
    
    XML =
-      "<action name=\"refreshMessages\">"
-      "<nombreMessage>2</nombreMessage>"
-      "<page>1</page>"
-      "<conversation><racine>3</racine><page>1</page></conversation>"
+      "<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>"
       %~ "<pseudo>Pifou</pseudo>"
       %~ "<contenu>test &amp; plop</contenu>"
-      %~ "</action>").
-   %~ traiter_xml(
-      %~ "<action name=\"generationCaptcha\">"
       %~ "</action>").
 
 
@@ -50,23 +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).
-
-
-% un client demande la génération d'un captcha (obsolète)
-%~ traiter_action([#xmlAttribute{value="generationCaptcha"}], XML) ->
-   %~ euphorik_protocole:generation_captcha(XML); 
-% un client se log pour la première fois (obsolète)
-%~ traiter_action([#xmlAttribute{value="loginCaptcha"}], XML) ->
-   %~ euphorik_protocole:nouveau_user_captcha(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);