Update to the new library 'json2'

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

diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl
index 8ee67a5..49cbe02 100755 (executable)
--- a/modules/erl/euphorik_requests.erl
+++ b/modules/erl/euphorik_requests.erl
@@ -19,10 +19,10 @@
 % This module responds to JSON requests via 'AJAX'.\r
 % It's defined as an Yaws 'appmods' with the url '/request'.\r
 % For instance in debug mode 'http://localhost:8090/request' will call the out/1 function.\r
-% @author G.Burri\r
 \r
 \r
 -module(euphorik_requests).\r
+-author("Greg Burri <greg.burri@gmail.com>").\r
 -export([out/1]).\r
 -include_lib("yaws_api.hrl").\r
 -include("../include/euphorik_defines.hrl").\r
@@ -36,8 +36,10 @@ out(A) ->
    end,\r
    % active: to receive {tcp_closed, _} when the socket is closing.\r
    % keepalive: avoid firewalls to cut the connection.\r
+\r
    inet:setopts(A#arg.clisock, [{active, true}, {keepalive, true}]),\r
    {value, {_, Contenu}} = lists:keysearch("action", 1, yaws_api:parse_post(A)),\r
+\r
    Ret = traiter_message(Contenu, IP),\r
    {content, "application/json", Ret}.\r
 \r
@@ -45,8 +47,9 @@ out(A) ->
 % Décode le message JSON.\r
 traiter_message(Contenu, IP) ->\r
    % extrait l'entête obligatoire des messages JSON\r
-   {ok, {struct, [{header, {struct, [{action, Action}, {version, Version_client}]}} | Reste]}} = json:decode_string(Contenu),\r
-   json:encode(\r
+   {ok, {struct, [{"header", {struct, [{"action", Action}, {"version", Version_client}]}} | Reste]}} = json2:decode_string(Contenu),\r
+\r
+   json2:encode(\r
       if Version_client =:= ?VERSION_PROTOCOLE ->\r
             traiter_action(Action, Reste, IP);\r
          true ->\r