From a193d10c45d8226937c91a17dc588e4f6f1586fd Mon Sep 17 00:00:00 2001
From: Greg Burri <greg.burri@gmail.com>
Date: Sat, 31 May 2008 09:30:42 +0000
Subject: [PATCH 1/1] =?utf8?q?FIX=20la=20css=20g=C3=A9n=C3=A9r=C3=A9=20dan?=
 =?utf8?q?s=20yaws=20lorsque=20la=20personne=20n'est=20pas=20connect=C3=A9?=
 =?utf8?q?=20FIX=20minification=20des=20;;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 index.yaws             |  8 +++++---
 js/pageMinichat.js     |  2 +-
 tools/jsmin.rb         | 13 +++++++++++--
 tools/mise_en_prod.erl |  5 +++--
 tools/mise_en_prod.rb  |  3 +++
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/index.yaws b/index.yaws
index 7de72c8..1b88721 100755
--- a/index.yaws
+++ b/index.yaws
@@ -6,13 +6,15 @@
    <title>euphorik.ch</title>
    <erl>
       out(A) -> 
+         CSS = case euphorik_bd:css_from_user_cookie(yaws_api:find_cookie_val("cookie", A)) of
+            undefined -> "css/1/euphorik.css";
+            C -> C
+         end,
          {ehtml, {link ,
             [
                {id, "cssPrincipale" },
                {rel, "stylesheet"},
-               {href, 
-                  euphorik_bd:css_from_user_cookie(yaws_api:find_cookie_val("cookie", A))
-               },
+               {href, CSS},
                {type, "text/css"},
                {media, "screen"}
             ], []}
diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index b6c93d8..c46b82d 100755
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -526,7 +526,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
          for (var id in message.repondA)
          {
             if (!debut) XHTMLrepondA += ", "
-            dumpObj(message.repondA.count)
+            ;; dumpObj(message.repondA.count)
             XHTMLrepondA += this.formateur.traitementComplet(message.repondA[id].pseudo)
             debut = false
          }
diff --git a/tools/jsmin.rb b/tools/jsmin.rb
index 05a5e7d..83e2e40 100644
--- a/tools/jsmin.rb
+++ b/tools/jsmin.rb
@@ -67,9 +67,18 @@ end
 def mynext()
     c = get
     # saute les commentaires (également les lignes commencant pas ;;)
-    if (c == "/" or c == ";")
+    
+    if (c == ";" and peek == ";")
+      while(true)
+          c = get
+          if (c[0] <= "\n"[0])
+            return c
+          end
+      end
+    end
+    if (c == "/")
        prochain = peek
-        if(prochain  == "/" or prochain == ";")
+        if(prochain  == "/")
             while(true)
                 c = get
                 if (c[0] <= "\n"[0])
diff --git a/tools/mise_en_prod.erl b/tools/mise_en_prod.erl
index 850c3e8..fa19b84 100755
--- a/tools/mise_en_prod.erl
+++ b/tools/mise_en_prod.erl
@@ -3,14 +3,15 @@
 
 % Executé sur le serveur après la copie des fichiers lors de la mise en production.
 % Recharge les modules de euphorik et met à jour la BD.
+% TODO : construire le nom du noeud en fonction du nom de l'host
 
 main(_) -> 
    net_kernel:start([flynux, shortnames]),
    io:format("recharchement des modules..~n"),
-   _Pid = spawn_link(yaws@flynux, euphorik_daemon, reload_euphorik, []),
+   _Pid = spawn_link(yaws@overnux, euphorik_daemon, reload_euphorik, []),
    receive
       {'EXIT', _, _} ->
          io:format("mise à jour de la BD..~n"),
-         spawn(yaws@flynux, euphorik_bd, update, [])
+         spawn(yaws@overnux, euphorik_bd, update, [])
    end.
 
diff --git a/tools/mise_en_prod.rb b/tools/mise_en_prod.rb
index 09cd568..19e180b 100755
--- a/tools/mise_en_prod.rb
+++ b/tools/mise_en_prod.rb
@@ -37,6 +37,7 @@ def creer_remote_rep(rep)
 end
 
 creer_remote_rep('BD')
+`ssh #{$host} "chmod g+w #{$rep_remote}/BD"`
 
 Dir.chdir('..')
 print `rsync #{$opt_rsync} index.yaws #{$host}:#{$rep_remote}`
@@ -56,6 +57,8 @@ Dir.entries(rep_js).each{|fichier|
 
 creer_remote_rep('modules')
 `rsync #{$opt_rsync} -r modules/ebin #{$host}:#{$rep_remote}/modules`
+`rsync #{$opt_rsync} -r modules/include #{$host}:#{$rep_remote}/modules`
+
 `rsync #{$opt_rsync} -r pages #{$host}:#{$rep_remote}`
 
 
-- 
2.43.0