X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_bd_admin.erl;h=18e6cedfd5749a0af12e14ed209324f1e92e694b;hp=b683cc51799d35800601a9b96b30cec7a29aada5;hb=d1e6f8e7c86f1ee75e854266463541ffedb916c9;hpb=7892ce3f365cbb8b6cc7d7c3799e296fc5fff1a5

diff --git a/modules/erl/euphorik_bd_admin.erl b/modules/erl/euphorik_bd_admin.erl
index b683cc5..18e6ced 100644
--- a/modules/erl/euphorik_bd_admin.erl
+++ b/modules/erl/euphorik_bd_admin.erl
@@ -16,20 +16,20 @@
 % You should have received a copy of the GNU General Public License
 % along with Euphorik.  If not, see <http://www.gnu.org/licenses/>.
 % 
-% Module mettant à disposition tout un tas de fonction pour l'administration de la base de données euphorik comme :
-%  - Création de la BD
-%  - Mise à jour de la BD
-%  - Backup et restauration
-%  - Copie de la BD à partir d'un autre noeud
+% Module mettant à disposition tout un tas de fonction pour l'administration de la base de données euphorik comme :
+%  - Création de la BD
+%  - Mise à jour de la BD
+%  - Backup et restauration
+%  - Copie de la BD à partir d'un autre noeud
 %
 % @author G.Burri
 
 -module(euphorik_bd_admin).
 -export([
-   version_bd/0,
-   create/0,
-   connect/0,
-   connect/1,
+   version_bd/0,
+   create/0,
+   connect/0,
+   connect/1,
    reset/0,
    update/0,
    backup/1,
@@ -47,82 +47,82 @@ version_bd() ->
       fun() ->
          mnesia:read({proprietes, version})
       end
-   )).
-   
-
-% Instructions pour créer une nouvelle base : 
-% $erl -sname yaws -mnesia dir '"/projets/euphorik/BD"'
-% voir doc/installation.txt
-% >l(euphorik_bd).
-% >euphorik_bd:create().
-create() ->
-   mnesia:stop(),
-   mnesia:delete_schema([node()]),
-   mnesia:create_schema([node()]), % nécessaire pour les tables sur disc
-   mnesia:start(),
-   create_tables(),
-   reset().
-   
-create_tables() ->
-   mnesia:create_table(counter, [
-      {attributes, record_info(fields, counter)},
-      {disc_copies, [node()]}
-   ]),
-   mnesia:create_table(proprietes, [
-      {attributes, record_info(fields, proprietes)},
-      {disc_copies, [node()]}
-   ]),
-   mnesia:create_table(minichat, [
-      {attributes, record_info(fields, minichat)},
-      {index, [auteur_id, troll_id]},
-      {disc_copies, [node()]}
-   ]),
-   mnesia:create_table(reponse_minichat, [
-      {type, bag},
-      {attributes, record_info(fields, reponse_minichat)},
-      {index, [cible]},
-      {disc_copies, [node()]}
-   ]),
-   mnesia:create_table(user, [
-      {attributes, record_info(fields, user)},
-      {index, [cookie, login]},
-      {disc_copies, [node()]}
-   ]),
-   mnesia:create_table(ip_table, [
-      {attributes, record_info(fields, ip_table)},
-      {disc_copies, [node()]}
-   ]),
-   mnesia:create_table(troll, [
-      {attributes, record_info(fields, troll)},
-      {index, [date_post]},
-      {disc_copies, [node()]}
-   ]).
-   
-   
-% Connexion à la base de données de yaws sur overnux
-connect() ->
-   connect(yaws@flynux).
-connect(Node) ->
-   mnesia:start(),
-   mnesia:change_config(extra_db_nodes, [Node]).
-
-
-% Efface toutes les données de la base de données.
-reset() ->
-   mnesia:clear_table(counter),
-   mnesia:clear_table(proprietes),
-   mnesia:clear_table(user),
-   mnesia:clear_table(reponse_minichat),
-   mnesia:clear_table(minichat),
-   mnesia:clear_table(troll),
-   mnesia:clear_table(ip_table),
-   % crée l'utilisateur root
-   mnesia:transaction(fun() ->
-      mnesia:write(#proprietes{nom = version, valeur = ?VERSION_BD}),
-      User = #user{id = 0, pseudo = "Sys", login = "Sys", date_creation = now(), date_derniere_connexion = now(), ek_master = true},
-      mnesia:write(User),
-      User
-   end).
+   )).
+   
+
+% Instructions pour créer une nouvelle base : 
+% $erl -sname yaws -mnesia dir '"/projets/euphorik/BD"'
+% voir doc/installation.txt
+% >l(euphorik_bd).
+% >euphorik_bd:create().
+create() ->
+   mnesia:stop(),
+   mnesia:delete_schema([node()]),
+   mnesia:create_schema([node()]), % nécessaire pour les tables sur disc
+   mnesia:start(),
+   create_tables(),
+   reset().
+   
+create_tables() ->
+   mnesia:create_table(counter, [
+      {attributes, record_info(fields, counter)},
+      {disc_copies, [node()]}
+   ]),
+   mnesia:create_table(proprietes, [
+      {attributes, record_info(fields, proprietes)},
+      {disc_copies, [node()]}
+   ]),
+   mnesia:create_table(minichat, [
+      {attributes, record_info(fields, minichat)},
+      {index, [auteur_id, troll_id]},
+      {disc_copies, [node()]}
+   ]),
+   mnesia:create_table(reponse_minichat, [
+      {type, bag},
+      {attributes, record_info(fields, reponse_minichat)},
+      {index, [cible]},
+      {disc_copies, [node()]}
+   ]),
+   mnesia:create_table(user, [
+      {attributes, record_info(fields, user)},
+      {index, [cookie, login]},
+      {disc_copies, [node()]}
+   ]),
+   mnesia:create_table(ip_table, [
+      {attributes, record_info(fields, ip_table)},
+      {disc_copies, [node()]}
+   ]),
+   mnesia:create_table(troll, [
+      {attributes, record_info(fields, troll)},
+      {index, [date_post]},
+      {disc_copies, [node()]}
+   ]).
+   
+   
+% Connexion à la base de données de yaws sur overnux
+connect() ->
+   connect(yaws@flynux).
+connect(Node) ->
+   mnesia:start(),
+   mnesia:change_config(extra_db_nodes, [Node]).
+
+
+% Efface toutes les données de la base de données.
+reset() ->
+   mnesia:clear_table(counter),
+   mnesia:clear_table(proprietes),
+   mnesia:clear_table(user),
+   mnesia:clear_table(reponse_minichat),
+   mnesia:clear_table(minichat),
+   mnesia:clear_table(troll),
+   mnesia:clear_table(ip_table),
+   % crée l'utilisateur root
+   mnesia:transaction(fun() ->
+      mnesia:write(#proprietes{nom = version, valeur = ?VERSION_BD}),
+      User = #user{id = 0, profile = #profile{pseudo = "Sys"}, login = "Sys", date_creation = now(), date_derniere_connexion = now(), ek_master = true},
+      mnesia:write(User),
+      User
+   end).
    
 
 % Met à jour la bd, compare ?VERSION_BD avec la version dans la table 'proprietes'
@@ -162,7 +162,7 @@ patch(1) ->
    mnesia:transform_table(
       user,
       fun({user, Id, Cookie, Pseudo, Login, Password, Email, Date_creation, Date_derniere_connexion, Css, Nick_format, View_times, View_tooltips, Indice_flood, _Page_principale, Conversations, Ek_master, Last_ip}) ->
-            {user, Id, Cookie, Pseudo, Login, Password, Email, Date_creation, Date_derniere_connexion, patch1_transforme_css(Css), Nick_format, View_times, View_tooltips, light, reverse, Indice_flood, lists:map(fun({R, _}) -> {R, false} end, Conversations), Ek_master, Last_ip}
+            {user, Id, Cookie, Login, Password, {profile, Pseudo, Email, patch1_transforme_css(Css), Nick_format, View_times, View_tooltips, light, reverse, lists:map(fun({R, _}) -> {R, false} end, Conversations)}, Date_creation, Date_derniere_connexion, Indice_flood, Ek_master, Last_ip}
       end,
       record_info(fields, user),
       user