X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_requests.erl;h=13a86cb514480ffb4967f00cd814e517e412835b;hp=81dd2e875094e3ff2cd7cd828849b1d837560d50;hb=0b34258466c58a805a2cbfe7ef134385b26fed94;hpb=044398d0ce631201bb0f724450446b90a35d79ce

diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl
index 81dd2e8..13a86cb 100755
--- a/modules/erl/euphorik_requests.erl
+++ b/modules/erl/euphorik_requests.erl
@@ -28,22 +28,12 @@ out(A) ->
 
 
 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]}} ->
+         %io:format("~p~n", [euphorik_protocole:login(JSON)]),
+         json:encode(traiter_action(Action, Reste));
+      _ ->
+         error
    end.