X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_bd.erl;h=d354c21e983e8b86613f2f38de14e1c4a5bffea3;hp=e10ef2ab5b1a6ea51ad23cf11f11cf8bc801d6ca;hb=8bec0dac79e750d0040de8a009c6ae864479642e;hpb=a2f6d159387e456847fb4e7607b4663ab8fa94fc

diff --git a/modules/erl/euphorik_bd.erl b/modules/erl/euphorik_bd.erl
index e10ef2a..d354c21 100755
--- a/modules/erl/euphorik_bd.erl
+++ b/modules/erl/euphorik_bd.erl
@@ -52,17 +52,22 @@
    % trolls :
    trolls/0,
    trolls/1,
+   trolls_attente/1,
    put_troll/2,
    mod_troll/2,
    del_troll/1,
    troll_by_id/1,
+   current_troll/0,
+   elire_troll/0,
    
    % versions :
    update_version/1,
    
    % utiles :
    resultat_transaction/1
-]).
+]).
+
+-import(qlc, [e/1, e/2, q/1, cursor/1]).
 
 -include("../include/euphorik_bd.hrl").
 -include("../include/euphorik_defines.hrl").
@@ -239,7 +244,7 @@ update_pseudo_user(UserId, Pseudo) ->
 % Renvoie tous les users.
 users() ->
    resultat_transaction(mnesia:transaction(fun() ->
-      qlc:e(qlc:q([E || E <- mnesia:table(user)]))
+      e(q([E || E <- mnesia:table(user)]))
    end)).   
    
 
@@ -248,7 +253,7 @@ users() ->
 user_by_cookie(Cookie) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         case qlc:e(qlc:q([E || E <- mnesia:table(user), E#user.cookie =:= Cookie])) of
+         case e(q([E || E <- mnesia:table(user), E#user.cookie =:= Cookie])) of
             [User] -> {ok, User};
             _ -> erreur
          end
@@ -259,7 +264,7 @@ user_by_cookie(Cookie) ->
 user_by_id(ID) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         case qlc:e(qlc:q([E || E <- mnesia:table(user), E#user.id =:= ID])) of
+         case e(q([E || E <- mnesia:table(user), E#user.id =:= ID])) of
             [User] -> {ok, User};
             _ -> erreur
          end
@@ -270,7 +275,7 @@ user_by_id(ID) ->
 user_by_login(Login) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         Users = qlc:e(qlc:q([E || E <- mnesia:table(user), E#user.login =:= Login])),
+         Users = e(q([E || E <- mnesia:table(user), E#user.login =:= Login])),
          case Users of
             [User] -> {ok, User};
             _ -> erreur
@@ -282,7 +287,7 @@ user_by_login(Login) ->
 toggle_ek_master(User_id) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         Users = qlc:e(qlc:q([E || E <- mnesia:table(user), E#user.id =:= User_id])),
+         Users = e(q([E || E <- mnesia:table(user), E#user.id =:= User_id])),
          case Users of
             [User] ->
                mnesia:write(User#user{ek_master = not User#user.ek_master});
@@ -295,7 +300,7 @@ toggle_ek_master(User_id) ->
 user_by_login_password(Login, Password) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         case qlc:e(qlc:q([E || E <- mnesia:table(user), E#user.login =:= Login, E#user.password =:= Password])) of
+         case e(q([E || E <- mnesia:table(user), E#user.login =:= Login, E#user.password =:= Password])) of
             [User | _] -> {ok, User};
             _ -> erreur
          end
@@ -307,7 +312,7 @@ user_by_login_password(Login, Password) ->
 user_by_mess(Id) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         case qlc:e(qlc:q([U || U <- mnesia:table(user), M <- mnesia:table(minichat), M#minichat.id =:= Id, M#minichat.auteur_id =:= U#user.id])) of
+         case e(q([U || U <- mnesia:table(user), M <- mnesia:table(minichat), M#minichat.id =:= Id, M#minichat.auteur_id =:= U#user.id])) of
             [User | _] -> {ok, User};
             _ -> erreur
          end
@@ -320,9 +325,9 @@ user_by_mess(Id) ->
 nouveau_message(Mess, Auteur_id, Repond_A) ->
    % regarde si les id 'Repond_A' existent
    F = fun() ->   
-      Nb_id_trouve = length(qlc:e(qlc:q([E#minichat.id || E <- mnesia:table(minichat), lists:member(E#minichat.id, Repond_A)]))),
+      Nb_id_trouve = length(e(q([E#minichat.id || E <- mnesia:table(minichat), lists:member(E#minichat.id, Repond_A)]))),
       % est-ce que l'auteur existe ?
-      Auteur = case qlc:e(qlc:q([E || E <- mnesia:table(user), E#user.id =:= Auteur_id])) of
+      Auteur = case e(q([E || E <- mnesia:table(user), E#user.id =:= Auteur_id])) of
          [A] -> A;
          _ -> throw("L'auteur du message est introuvable")
       end,
@@ -380,7 +385,7 @@ messages(N) ->
 % Renvoie N messages se trouvant sur la page P
 messages(N, P) ->  
    F = fun() ->
-      C = qlc:cursor(qlc:q([E || E <- qlc:keysort(2, mnesia:table(minichat), [{order, descending}])])),
+      C = cursor(q([E || E <- qlc:keysort(2, mnesia:table(minichat), [{order, descending}])])),
       if P > 1 -> qlc:next_answers(C, N * (P - 1));
          true -> ok
       end,
@@ -401,7 +406,7 @@ messages(Id, N, P) ->
 message_by_id(Id) ->
    case resultat_transaction(mnesia:transaction(
       fun() ->
-         qlc:e(qlc:q([E || E <- qlc:keysort(2, mnesia:table(minichat), [{order, ascending}]), Id =:= E#minichat.id]))
+         e(q([E || E <- qlc:keysort(2, mnesia:table(minichat), [{order, ascending}]), Id =:= E#minichat.id]))
       end
    )) of
       [M] -> {ok, M};
@@ -414,8 +419,8 @@ messages_by_ids(Ids) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
          % TODO : optimisations ? serait-ce du O(n) ?
-         Query = qlc:q([E || E <- qlc:keysort(2, mnesia:table(minichat), [{order, ascending}]), lists:any(fun(Id) -> Id =:= E#minichat.id end, Ids)]),
-         qlc:e(Query)
+         Query = q([E || E <- qlc:keysort(2, mnesia:table(minichat), [{order, ascending}]), lists:any(fun(Id) -> Id =:= E#minichat.id end, Ids)]),
+         e(Query)
       end
    )).
    
@@ -424,14 +429,14 @@ messages_by_ids(Ids) ->
 % TODO : ya pas plus simple ?
 message_existe(Id) ->
    resultat_transaction(mnesia:transaction(fun() ->
-      length(qlc:e(qlc:q([E#minichat.id || E <- mnesia:table(minichat), E#minichat.id =:= Id]))) =:= 1
+      length(e(q([E#minichat.id || E <- mnesia:table(minichat), E#minichat.id =:= Id]))) =:= 1
    end)).
    
    
 % Renvoie les reponses (utilisé normalement uniquement pendant le debug).
 reponses() ->
    F = fun() ->
-      qlc:e(qlc:q([E || E <- mnesia:table(reponse_minichat)]))
+      e(q([E || E <- mnesia:table(reponse_minichat)]))
    end,
    resultat_transaction(mnesia:transaction(F)).
    
@@ -440,7 +445,7 @@ reponses() ->
 repond_a(M_id) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         qlc:e(qlc:q(
+         e(q(
             [M || E <- mnesia:table(reponse_minichat),
             M <- mnesia:table(minichat),
             E#reponse_minichat.repondant =:= M_id,
@@ -453,7 +458,7 @@ repond_a(M_id) ->
 est_une_reponse_a_user(Id_user, Id_mess) ->
    case mnesia:transaction(
             fun() ->
-               qlc:e(qlc:q([
+               e(q([
                   M#minichat.auteur_id || M <- mnesia:table(minichat), R <- mnesia:table(reponse_minichat),
                   M#minichat.auteur_id =:= Id_user, M#minichat.id =:= R#reponse_minichat.cible, R#reponse_minichat.repondant =:= Id_mess
                ]), [{unique_all, true}])
@@ -468,7 +473,7 @@ est_une_reponse_a_user(Id_user, Id_mess) ->
 a_repondu_a_message(Id_user, Id_mess) ->
    case mnesia:transaction(
             fun() ->
-               qlc:e(qlc:q([
+               e(q([
                   M#minichat.auteur_id || M <- mnesia:table(minichat), R <- mnesia:table(reponse_minichat),
                   R#reponse_minichat.cible =:= Id_mess, R#reponse_minichat.repondant =:= M#minichat.id, M#minichat.auteur_id =:= Id_user
                ]), [{unique_all, true}])
@@ -483,7 +488,7 @@ a_repondu_a_message(Id_user, Id_mess) ->
 possede_message(Id_user, Id_mess) ->
    case mnesia:transaction(
             fun() ->
-               qlc:e(qlc:q([E#minichat.auteur_id || E <- mnesia:table(minichat), E#minichat.id =:= Id_mess]))
+               e(q([E#minichat.auteur_id || E <- mnesia:table(minichat), E#minichat.id =:= Id_mess]))
             end
          ) of
       {atomic, [Id_user | []]} -> true;
@@ -494,7 +499,7 @@ possede_message(Id_user, Id_mess) ->
 ip_table() ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         qlc:e(qlc:q([IP || IP <- mnesia:table(ip_table)]))
+         e(q([IP || IP <- mnesia:table(ip_table)]))
       end
    )).
 
@@ -523,7 +528,7 @@ deban(IP) ->
 est_banni(User_id) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         case qlc:e(qlc:q([
+         case e(q([
             {IP#ip_table.ban, IP#ip_table.ban_duration} ||
             U <- mnesia:table(user),
             U#user.id =:= User_id,
@@ -560,7 +565,7 @@ date_plus_minutes(Ban, Ban_duration) ->
 can_register(IP) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         case qlc:e(qlc:q([I || I <- mnesia:table(ip_table), I#ip_table.ip =:= IP])) of
+         case e(q([I || I <- mnesia:table(ip_table), I#ip_table.ip =:= IP])) of
             [] -> 
                mnesia:write(#ip_table{ip = IP, date_last_try_register = now()}),
                true;
@@ -585,10 +590,18 @@ can_register(IP) ->
 trolls() ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         qlc:e(qlc:q([T || T <- qlc:keysort(2, mnesia:table(troll))]))
+         e(q([T || T <- qlc:keysort(2, mnesia:table(troll))]))
       end
    )).
    
+   
+% Renvoie les trolls manquants posté après Last_id.
+trolls(Last_id) ->
+   resultat_transaction(mnesia:transaction(
+      e(q([T || T <- qlc:keysort(2, mnesia:table(troll)), T#troll.id > Last_id, T#troll.date_post =:= undefined]))
+   )).
+   
+   
 % Renvoie les trolls manquants posté après Last_id.
 % Si pas de trolls alors attend un événement tel qu'un ajout, une modification ou une suppression.
 % renvoie :
@@ -596,26 +609,31 @@ trolls() ->
 % ou {add, [Trolls]}
 % ou {del, Troll_id}
 % ou timeout
-trolls(Last_id) ->
+trolls_attente(Last_id) ->
    case mnesia:subscribe({table, troll, detailed}) of
       {error, E} = E ->
          E;
       _ ->
-         case resultat_transaction(mnesia:transaction(
+         R = case resultat_transaction(mnesia:transaction(
                fun() ->
-                  qlc:e(qlc:q([T || T <- qlc:keysort(2, mnesia:table(troll)), T#troll.id > Last_id, T#troll.date_post =:= undefined]))
+                  e(q([T || T <- qlc:keysort(2, mnesia:table(troll)), T#troll.id > Last_id, T#troll.date_post =:= undefined]))
                end
             )) of
                [] -> % pas de trolls
                   attend_evenement_troll();
                Trolls ->
                   {add, Trolls}
-         end
+         end,
+         mnesia:unsubscribe({table, troll, detailed}),
+         R
    end.
    
 attend_evenement_troll() ->
    % s'il n'y a pas de trolls que l'utilisateur n'a pas connaissance alors on attend un événement
    receive
+      % cas où un troll est choisit comme courant
+      {mnesia_table_event, {write, troll, Troll, [Old_troll | _], _}} when Old_troll#troll.date_post =:= undefined, Troll#troll.date_post =/= undefined ->
+         {del, Troll#troll.id};
       {mnesia_table_event, {write, troll, Troll, [_Old_troll | _], _}} ->
          {mod, Troll};
       {mnesia_table_event, {write, troll, Troll, [], _}} ->
@@ -637,14 +655,14 @@ put_troll(User_id, Content) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
          % control le nombre de troll déjà posté
-         Nb_troll_poste_par_user = length(qlc:e(qlc:q(
+         Nb_troll_poste_par_user = length(e(q(
             [
                E#troll.id || E <- mnesia:table(troll),
                E#troll.id_user =:= User_id,
                E#troll.date_post =:= undefined
             ]
          ))),
-         Nb_troll_poste_total = length(qlc:e(qlc:q(
+         Nb_troll_poste_total = length(e(q(
             [
                E#troll.id || E <- mnesia:table(troll),
                E#troll.date_post =:= undefined
@@ -699,7 +717,7 @@ del_troll(Troll_id) ->
 troll_by_id(Troll_id) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         case qlc:e(qlc:q([T || T <- mnesia:table(troll), T#troll.id =:= Troll_id])) of
+         case e(q([T || T <- mnesia:table(troll), T#troll.id =:= Troll_id])) of
             [T] -> {ok, T};
             _ ->
                erreur
@@ -707,6 +725,44 @@ troll_by_id(Troll_id) ->
       end
    )).
    
+
+% Renvoie le troll actuel qui se trouve sur la page principale.
+% Renvois aucun si pas de troll courant.
+current_troll() ->
+   resultat_transaction(mnesia:transaction(
+      fun() ->
+         % TODO : ya pas moyen de désigner le champs plutot qu'avec un nombre pour le tri ?
+         C = cursor(q([T || T <- qlc:keysort(5, mnesia:table(troll), [{order, descending}]), T#troll.date_post =/= undefined])),
+         R = case qlc:next_answers(C, 1) of
+            [T] -> T;
+            _ -> aucun
+         end,
+         qlc:delete_cursor(C),
+         R
+      end
+   )).
+
+
+% Elit un troll au hasard parmis les trolls en attente (leur date_post =:= undefined)
+% met à jour sa date de post.
+% renvoie plus_de_trolls si il n'y a aucun troll en attente.
+elire_troll() ->       
+   {A1,A2,A3} = now(),
+   random:seed(A1, A2, A3),
+   mnesia:transaction(
+      fun() ->
+         case e(q([T || T <- mnesia:table(troll), T#troll.date_post =:= undefined])) of
+            [] ->
+               plus_de_trolls;
+            Trolls ->
+               Troll = lists:nth(random:uniform(length(Trolls)), Trolls),
+               Troll2 = Troll#troll{date_post = now()},
+               mnesia:write(Troll2)
+         end
+      end
+   ).
+   
+   
    
 update_version(1) ->
    mnesia:transform_table(