X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_requests.erl;h=5c2e538ff8a4cf3fc7bf09a8ceb877e1ec032c4e;hb=8583ca55323537ed45d12eb5cd62bc9e393d23db;hp=0e4b04685ce87953a68af9465f6dcad3dd57c932;hpb=c39e55c505a27e30209fcfb6d837d6ec8a82b990;p=euphorik.git
diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl
index 0e4b046..5c2e538 100755
--- a/modules/erl/euphorik_requests.erl
+++ b/modules/erl/euphorik_requests.erl
@@ -12,57 +12,57 @@
-include_lib("xmerl/include/xmerl.hrl").
-include_lib("yaws/include/yaws_api.hrl").
+
-% Test du module
+% Test du module (TODO)
tester() ->
-
- %~ {XML2, _} = xmerl_scan:string(
- %~ ""
- %~ " 5DZQ2HCRO7JIX3QCSWRNL"
- %~ ""),
- %~ io:format("Login : ~p~n", [euphorik_protocole:login(XML2)]).
-
- XML =
- "3FSDCH0FD4ML8WEPN2B5T"
- "10"
- "",
- io:format("Messages de la premières page : ~p~n", [traiter_xml(XML)]).
-
- %~ traiter_xml(""
- %~ "4UDUSY6Z2IZNTQO484S8X"
- %~ "Pifou"
- %~ "test & plop"
- %~ "").
+ que_dal.
-% il faut catcher toutes les exceptions possibles
-out(A) ->
+out(A) ->
+ %io:format("~p~n~n", [A]),
+ IP = case inet:peername(A#arg.clisock) of
+ {ok, {Adresse, _Port}} -> Adresse;
+ _ -> inconnue
+ end,
%inet:setopts(A#arg.clisock, inet:getopts(A#arg.clisock, [active])),
{value, {_, Contenu}} = lists:keysearch("action", 1, yaws_api:parse_post(A)),
- Ret = traiter_xml(Contenu),
- {content, "text/xml", Ret}.
+ Ret = traiter_donnees(Contenu, IP),
+ {content, "application/json", Ret}.
-traiter_xml(Contenu) ->
- {XML, _} = xmerl_scan:string(Contenu),
- traiter_action(XML#xmlElement.attributes, XML).
-
+traiter_donnees(Contenu, IP) ->
+ case json:decode_string(Contenu) of
+ {ok, {struct, [{action, Action}| Reste]}} ->
+ json:encode(traiter_action(Action, Reste, IP));
+ _ ->
+ error
+ end.
+
+% authentification d'un client
+traiter_action("authentification", JSON, IP) ->
+ euphorik_protocole:login(JSON, IP);
% un client s'enregistre (pseudo + password)
-traiter_action([#xmlAttribute{value="register"}], XML) ->
- euphorik_protocole:nouveau_user_login(XML);
-% authentification d'un client
-traiter_action([#xmlAttribute{value="login"}], XML) ->
- euphorik_protocole:login(XML);
+traiter_action("register", JSON, IP) ->
+ euphorik_protocole:register(JSON, IP);
% modification du profile
-traiter_action([#xmlAttribute{value="profile"}], XML) ->
- euphorik_protocole:profile(XML);
-% un utilisateur demande les messages
-traiter_action([#xmlAttribute{value="refreshMessages"}], XML) ->
- euphorik_protocole:refreshMessage(XML);
-% un utilisateur envoie un message
-traiter_action([#xmlAttribute{value="message"}], XML) ->
- euphorik_protocole:message(XML).
-
-
-
+traiter_action("set_profile", JSON, _) ->
+ euphorik_protocole:profile(JSON);
+% un utilisateur attend un événement (par exemple l'arrivé d'un nouveau message)
+traiter_action("wait_event", JSON, _) ->
+ euphorik_protocole:wait_event(JSON);
+% un utilisateur envoie un message
+traiter_action("put_message", JSON, _) ->
+ euphorik_protocole:put_message(JSON);
+traiter_action("ban", JSON, _) ->
+ euphorik_protocole:ban(JSON);
+traiter_action("slap", JSON, _) ->
+ euphorik_protocole:slap(JSON);
+traiter_action("put_troll", JSON, _) ->
+ euphorik_protocole:put_troll(JSON);
+traiter_action("mod_troll", JSON, _) ->
+ euphorik_protocole:mod_troll(JSON);
+traiter_action("del_troll", JSON, _) ->
+ euphorik_protocole:del_troll(JSON).
+
\ No newline at end of file