X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_requests.erl;h=49cbe026132afa200c3b98e313c0382faf002045;hp=42fb87ff5207d11ff3af83d7c592372690ee4fe7;hb=5d9992368bb386d2e606ae037c5478fe10ac70e8;hpb=81393a74d648e4830dc8c7c562fa203f50a105f6

diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl
index 42fb87f..49cbe02 100755
--- a/modules/erl/euphorik_requests.erl
+++ b/modules/erl/euphorik_requests.erl
@@ -16,28 +16,30 @@
 % You should have received a copy of the GNU General Public License
 % along with Euphorik.  If not, see <http://www.gnu.org/licenses/>.
 %
-% Ce module est fait pour répondre à des requêtes JSON via 'AJAX'.
-% Il est définit comme 'appmods' pour l'url "request" dans Yaws.
-% Par exemple http://www.euphorik.ch/request abouti sur la fonction out/1 de ce module.
-% @author G.Burri
+% This module responds to JSON requests via 'AJAX'.
+% It's defined as an Yaws 'appmods' with the url '/request'.
+% For instance in debug mode 'http://localhost:8090/request' will call the out/1 function.
 
 
 -module(euphorik_requests).
+-author("Greg Burri <greg.burri@gmail.com>").
 -export([out/1]).
 -include_lib("yaws_api.hrl").
 -include("../include/euphorik_defines.hrl").
 
 
-% Point d'entrée pour les requêtes AJAX sur http://www.euphorik.ch/request.
+% Entry point for all AJAX requests on '/request'.
 out(A) ->
    IP = case inet:peername(A#arg.clisock) of
-      {ok, {Adresse, _Port}} -> Adresse;
-      _ -> inconnue
+      {ok, {Address, _Port}} -> Address;
+      _ -> unknown
    end,
-   % passive -> active, permet de recevoir {tcp_closed, _} lorsque le socket se ferme
-   % keepalive -> true, evite que des firewalls coupe la connexion TCP sans prévenir
+   % active: to receive {tcp_closed, _} when the socket is closing.
+   % keepalive: avoid firewalls to cut the connection.
+
    inet:setopts(A#arg.clisock, [{active, true}, {keepalive, true}]),
    {value, {_, Contenu}} = lists:keysearch("action", 1, yaws_api:parse_post(A)),
+
    Ret = traiter_message(Contenu, IP),
    {content, "application/json", Ret}.
 
@@ -45,8 +47,9 @@ out(A) ->
 % Décode le message JSON.
 traiter_message(Contenu, IP) ->
    % extrait l'entête obligatoire des messages JSON
-   {ok, {struct, [{header, {struct, [{action, Action}, {version, Version_client}]}} | Reste]}} = json:decode_string(Contenu),
-   json:encode(
+   {ok, {struct, [{"header", {struct, [{"action", Action}, {"version", Version_client}]}} | Reste]}} = json2:decode_string(Contenu),
+
+   json2:encode(
       if Version_client =:= ?VERSION_PROTOCOLE ->
             traiter_action(Action, Reste, IP);
          true ->