MOD Avancement sur le passage à JSON

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

diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl
index d6d7294..2fb69c0 100755 (executable)
--- a/modules/erl/euphorik_requests.erl
+++ b/modules/erl/euphorik_requests.erl
@@ -23,12 +23,10 @@ tester() ->
    %~ io:format("Login : ~p~n", [euphorik_protocole:login(XML2)]).
    \r
    XML =\r
-      "<action name=\"refreshMessages\">"\r
-      "<nombreMessage>2</nombreMessage>"\r
-      "<page>1</page>"
-      "<conversation><racine>3</racine><page>1</page></conversation>"\r
+      "<action name=\"refreshMessages\"><cookie>3FSDCH0FD4ML8WEPN2B5T</cookie>"
+      "<nombreMessage>10</nombreMessage>"
       "</action>",\r
-   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)]).
    \r
    %~ traiter_xml("<action name=\"message\">"\r
       %~ "<cookie>4UDUSY6Z2IZNTQO484S8X</cookie>"\r
@@ -41,15 +39,30 @@ tester() ->
 out(A) ->\r
    %inet:setopts(A#arg.clisock, inet:getopts(A#arg.clisock, [active])),\r
    {value, {_, Contenu}} = lists:keysearch("action", 1, yaws_api:parse_post(A)),\r
-   Ret = traiter_xml(Contenu),\r
+   Ret = traiter_donnees(Contenu),\r
    {content, "text/xml", Ret}.\r
 
 \r
-traiter_xml(Contenu) ->\r
-   {XML, _} = xmerl_scan:string(Contenu),\r
-   traiter_action(XML#xmlElement.attributes, XML).\r
-   \r
-
+traiter_donnees(Contenu) ->\r
+   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.\r
+   
+   
+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); \r