fix first refresh (ouf !!)

diff --git a/install.py b/install.py
index d5a35f7537ab56a1a4930e6f818806f5a174e4a0..46df69be9363b5e4724c0b36a75acfd0443a6e2b 100644 (file)
--- a/install.py
+++ b/install.py
@@ -102,10 +102,11 @@ if not os.path.exists(apache_conf):
     shutil.copy('conf'+apache_conf, apache_conf)
 os.system('/etc/init.d/apache2 reload')
 
-log_dir = '/var/log/telecaster'
-if not os.path.exists(log_dir):
-    os.mkdir(log_dir)
-    os.system('chown -R ' + user + ':' + user + ' ' + log_dir) 
+log_dirs = ['/var/log/telecaster', '/var/log/deefuzzer']
+for  dir in log_dirs:
+    if not os.path.exists(dir):
+        os.mkdir(dir)
+        os.system('chown -R ' + user + ':' + user + ' ' + dir) 
 
 print """
    Installation successfull !

diff --git a/station.py b/station.py
index a0bce8493e06bbae31df401b70ce9863dfb80b43..8dbdc3fc9a28bcaf6559b4b5d163e3aa4fce9d53 100644 (file)
--- a/station.py
+++ b/station.py
@@ -159,7 +159,7 @@ class Station(Conference):
         conf_file.close()
 
     def deefuzzer_start(self):
-        command = 'deefuzzer ' + self.deefuzzer_user_file + ' &'
+        command = 'deefuzzer ' + self.deefuzzer_user_file + ' > /dev/null &'
         os.system(command)
         self.set_lock()
 

diff --git a/telecaster.py b/telecaster.py
index be6d374a21a84db42fa8716227d4c003e6bdb7bd..a0ff1517c5b306fc85100f2b67af0dd9c5421d09 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -105,7 +105,6 @@ class TeleCaster:
             s.start()
             time.sleep(1)
             self.logger.write_info('starting')
-#            form.stop_form(self.conference_dict, writing, casting)
             self.main()
 
         elif deefuzzer_pid != [] and os.path.exists(self.lock_file) and not form.has_key("action"):

diff --git a/webview.py b/webview.py
index 7e7057758cd589f3494651ebf45a587836691c8a..01f9a5a7cd57ab2ce87119c1ef204a889e74d798 100644 (file)
--- a/webview.py
+++ b/webview.py
@@ -40,10 +40,8 @@ import cgi
 import datetime
 import time
 import string
-import cgitb
 from tools import *
 from cgi import FieldStorage
-cgitb.enable()
 
 class WebView(FieldStorage):
     """Gives the web CGI frontend"""
@@ -109,16 +107,13 @@ class WebView(FieldStorage):
         for k in range(0, self.len_departments):
             department = self.departments[k]
             conferences = department['conferences']
-            #print conferences
             conferences_t = dict2tuple(conferences)
-            #print conferences
             conferences = '"'+'","'.join(conferences_t)+'"'
             print '       case '+str(k+1)+' : var text = new Array('+conferences+'); '
             print '       break;'
         print '       }'
         print '      for(j = 0; j<'+str(self.conference_nb_max)+'; j++)'
         print '       formulaire.conference.options[j+1].text=text[j];'
-        #print '       formulaire.conference.options[j+1].value=text[j];'
         print '}'
         print '      formulaire.conference.selectedIndex=0;}'
         print '</script>'
@@ -301,7 +296,7 @@ class WebView(FieldStorage):
         print "<div class=\"tools\">"
         print "<form method=\"post\" action=\"telecaster.py\" name=\"formulaire\">"
         print "<div class=\"buttons\">"
-        print "<button><img src=\"img/arrow_refresh.png\" alt=\"\">Refresh</button>"
+        print "<button type=\"submit\"><img src=\"img/arrow_refresh.png\" alt=\"\">Refresh</button>"
         print "<a href=\""+self.url+":"+self.port+"/"+self.mount_point+"\"><img src=\"img/control_play_blue.png\" alt=\"\">Play</a>"
         print "<button type=\"submit\" name=\"action\" value=\"stop\" class=\"negative\"><img src=\"img/cancel.png\" alt=\"\">Stop</button>"
         print "<a href=\"http://"+self.url+"/archives/\"><img src=\"img/folder_go.png\" alt=\"\">Archives</a>"