X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_requests.erl;h=7ee5c7dbe8c6388d8eda1429260fc9ff0af5af4a;hb=6fab12088e85e62ef34a312c3f3a33f9636bbc97;hp=81dd2e875094e3ff2cd7cd828849b1d837560d50;hpb=35838780dce22af9f2dc80af9149a30a0433de0a;p=euphorik.git

diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl
index 81dd2e8..7ee5c7d 100755
--- a/modules/erl/euphorik_requests.erl
+++ b/modules/erl/euphorik_requests.erl
@@ -12,8 +12,9 @@
 
 -include_lib("xmerl/include/xmerl.hrl").
 -include_lib("yaws/include/yaws_api.hrl").
+
 
-% Test du module
+% Test du module (TODO)
 tester() ->
    que_dal.
 
@@ -22,28 +23,16 @@ 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_donnees(Contenu),
-   %{content, "text/xml", Ret}.
+   Ret = traiter_donnees(Contenu),
    {content, "application/json", Ret}.
 
 
 traiter_donnees(Contenu) ->
-   % FIXME : ne plus encapsuler le JSON dans de l'xml... apparement yaws veux absolument de l'xml (voir post mi-avril 2008 sur la mailing list)
-   Reponse = case xmerl_scan:string(Contenu) of
-      {#xmlElement{name = json, content = [#xmlText{value = J}|_]}, _} ->
-         case json:decode_string(J) of
-            {ok, {struct, [{action, Action}| Reste]}} ->
-               %io:format("~p~n", [euphorik_protocole:login(JSON)]),
-               json:encode(traiter_action(Action, Reste));
-            _ ->
-               error
-         end;
-      _ -> error
-   end,
-   if Reponse =:= error ->
-         euphorik_protocole:erreur("Format XML/JSON incorrect");
-      true ->
-         Reponse
+   case json:decode_string(Contenu) of
+      {ok, {struct, [{action, Action}| Reste]}} ->
+         json:encode(traiter_action(Action, Reste));
+      _ ->
+         error
    end.