From: Greg Burri Date: Wed, 19 Nov 2008 13:49:42 +0000 (+0000) Subject: MOD beginning of the refactoring .. ^-^ X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=commitdiff_plain;h=7ea77e03a1191ed84719ec018635cbe4a1b44259 MOD beginning of the refactoring .. ^-^ --- diff --git a/README b/README index d598ee5..3541f66 100644 --- a/README +++ b/README @@ -1 +1 @@ -Voir : http://dev.euphorik.ch/wiki/euk/Accueil \ No newline at end of file +See : http://dev.euphorik.ch/wiki/euk/Home \ No newline at end of file diff --git a/doc/architecture_serveur.svg b/doc/architecture_serveur.svg index d21b5be..8a00377 100644 --- a/doc/architecture_serveur.svg +++ b/doc/architecture_serveur.svg @@ -58,15 +58,15 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.98994949" - inkscape:cx="399.00263" - inkscape:cy="-106.1694" + inkscape:zoom="1.4" + inkscape:cx="362.17823" + inkscape:cy="1034.0028" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1280" - inkscape:window-height="943" - inkscape:window-x="1276" + inkscape:window-height="945" + inkscape:window-x="-4" inkscape:window-y="-4" showborder="false" inkscape:showpageshadow="false" /> @@ -87,13 +87,12 @@ id="layer1" style="display:inline"> + style="opacity:1;fill:#2affd5;fill-opacity:1;stroke:#7a7a7a;stroke-width:1.53152299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" + id="rect2515" + width="594.40643" + height="145.24025" + x="135.14209" + y="-129.56824" /> - client Data Version 1.* - Version 2.* - - user 1 - - user 2 - - user 3 - - user 4 - - - Yaws - - ek_requests - - ek_protocol - - ek_admin - - ek_common - - - - - - - - module : - process : - + id="tspan2519" + x="21.274195" + y="-34.15234">Web client + + + fragment + + + + formater + + + + util + + + + communication + + + + client + - PostGreSQL + style="opacity:0.62093865;fill:#aaccff;fill-opacity:1;stroke:#000000;stroke-width:0.35433072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect2617" + width="498.57144" + height="30" + x="159.14285" + y="-115.63783" + ry="10" /> + + + pages + + + + pageChat + + + + pageAdmin + + + + pageProfile + + + + pageRegister + + + + pageAbout + - client + style="opacity:0.62093865;fill:#aaccff;fill-opacity:1;stroke:#000000;stroke-width:0.35433072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" + id="rect2619" + width="353.1095" + height="30" + x="158.28395" + y="-58.61768" + ry="10" /> + + + chat + + + + conversations + + + + message + + + + conversation + - JSON/HTTP - - ek_bd - - mnesia + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.47843137" + d="M 386.87041,-6.1634945 L 315.22162,-3.5972453" + id="path2669" + inkscape:connector-type="polyline" + inkscape:connection-start="#g2561" + inkscape:connection-end="#g2553" + sodipodi:nodetypes="ccc" /> + inkscape:connection-end="#g2553" + inkscape:connection-start="#rect2619" /> + inkscape:connection-start="#g2577" + inkscape:connection-end="#g2621" /> diff --git a/js/pageMinichat/pageMinichat.js b/js/pageMinichat/pageMinichat.js index b71efea..032ce41 100755 --- a/js/pageMinichat/pageMinichat.js +++ b/js/pageMinichat/pageMinichat.js @@ -30,9 +30,6 @@ euphorik.PageMinichat = function(client, formateur, util, communication) { // permet d'éviter d'envoyer plusieurs messages simultanément en pressant // rapidement sur "enter" par exemple this.envoieMessageEnCours = false; - - this.regexMessageTagMatch = /\{.*?\}>/g; - this.regexMessageTagReplace = /^(.*?\{.*?\}>)*/; }; euphorik.PageMinichat.prototype.contenu = function() { diff --git a/modules/Makefile b/modules/Makefile index 859cc56..1e68f2b 100755 --- a/modules/Makefile +++ b/modules/Makefile @@ -1,26 +1,24 @@ # coding: utf-8 -# Répertoire dans lequel se trouve les modules compilés (beam) +# For more informations about the modules listed here see : http://dev.euphorik.ch/wiki/euk/Home + +# Directory where the compiled modules will be put rep_ebin = ebin - -# Répertoire dans lequel se trouve les fichiers sources + +# Directory where the sources are rep_erl = erl - -# Répertoire dans lequel se trouve les fichier hrl (définition de record) + +# Directory which contains the hrl files (records definition) rep_include = include - -# Paramètres du compilateur -# il est possible de compiler en natif en executant : + +# Arguments for the compilator +# It's possible to compile in native mode with : # $ make NATIVE=true -# les différents tests on montrés que ca n'augmentait pas les performances -# car très lié à la base de données -# TODO : simplifier et éviter les répetitions -ifdef NATIVE +ifdef NATIVE erlc_params = +native -I $(rep_include) -o $(rep_ebin) $< else erlc_params = -I $(rep_include) -o $(rep_ebin) $< endif -# Compilation de toute l'application euphorik all: $(rep_ebin)/smtp.beam \ $(rep_ebin)/euphorik_bd.beam \ $(rep_ebin)/euphorik_minichat_conversation.beam \ @@ -32,46 +30,32 @@ $(rep_ebin)/euphorik_bd_admin.beam \ $(rep_ebin)/euphorik_common.beam \ $(rep_ebin)/euphorik_test.beam -# Module pour l'envoie d'email $(rep_ebin)/smtp.beam: $(rep_erl)/smtp.erl erlc $(erlc_params) -# Module pour la gestion des données persistante la BD $(rep_ebin)/euphorik_bd.beam: $(rep_erl)/euphorik_bd.erl $(rep_include)/euphorik_bd.hrl $(rep_include)/euphorik_defines.hrl erlc $(erlc_params) -# Module pour la mise à jour de la BD $(rep_ebin)/euphorik_bd_admin.beam: $(rep_erl)/euphorik_bd_admin.erl $(rep_include)/euphorik_bd.hrl $(rep_include)/euphorik_defines.hrl erlc $(erlc_params) -# Module permettant l'extraction des conversations du minichat $(rep_ebin)/euphorik_minichat_conversation.beam: $(rep_erl)/euphorik_minichat_conversation.erl $(rep_include)/euphorik_bd.hrl erlc $(erlc_params) -# Module traitant les requêtes AJAX du client javascript d'euphorik $(rep_ebin)/euphorik_requests.beam: $(rep_erl)/euphorik_requests.erl $(rep_include)/euphorik_defines.hrl erlc $(erlc_params) -# Module interpretant les messages XML du client $(rep_ebin)/euphorik_protocole.beam: $(rep_erl)/euphorik_protocole.erl $(rep_include)/euphorik_defines.hrl erlc $(erlc_params) - -# Module pour la génération du captcha -#$(rep_ebin)/captcha.beam: $(rep_erl)/captcha.erl -# erlc $(erlc_params) - -# Module effectuant periodiquement certaines tâches + $(rep_ebin)/euphorik_daemon.beam: $(rep_erl)/euphorik_daemon.erl $(rep_include)/euphorik_defines.hrl erlc $(erlc_params) -# Module avec plein de bordel dedant $(rep_ebin)/euphorik_common.beam: $(rep_erl)/euphorik_common.erl erlc $(erlc_params) -# Module dédié au tests $(rep_ebin)/euphorik_test.beam: $(rep_erl)/euphorik_test.erl $(rep_include)/euphorik_bd.hrl erlc $(erlc_params) -# Suppression des modules compilés clean: rm ebin/*.beam