don't reset form, try to fix refresh bug...

diff --git a/telecaster.py b/telecaster.py
index ede25fa94f74fa2c8328ad719b90c75faa9e3ea0..f83c0347de11182eac5c4dad8f7cee01dd698d71 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -100,15 +100,16 @@ class TeleCaster:
                         'professor': self.form.getfirst("professor"),
                         'comment': self.form.getfirst("comment")}
 
-            self.form = 0
+            #self.form = 0
             #print "Content-Type: text/html\n\n"
             #print self.transition_head()
             s = Station(self.conf_file, self.conference_dict, self.lock_file)
             s.start()
-#            time.sleep(1)
+            time.sleep(1)
             #print self.transition_foot()
             self.logger.write_info('starting')
-            self.main()
+            self.form.stop_form(self.conference_dict, writing, casting)
+            #self.main()
 
         elif deefuzzer_pid != [] and os.path.exists(self.lock_file) and not self.form.has_key("action"):
             self.conference_dict = get_conference_from_lock(self.lock_file)
@@ -127,12 +128,12 @@ class TeleCaster:
         elif deefuzzer_pid == []:
             self.form.start_form(writing, casting)
             self.logger.write_info('stopped')
-    
+
 
 conf_file = '/etc/telecaster/telecaster.xml'
 
 if __name__ == '__main__':
     t = TeleCaster(conf_file)
     t.main()
- 
+
 

diff --git a/webview.py b/webview.py
index 825f6f86dbfa710cd63a8fd2537d31c51bb6d523..2d35182bb5b74ad464e1bdd9f6a468fb989d0d57 100644 (file)
--- a/webview.py
+++ b/webview.py
@@ -130,7 +130,7 @@ class WebView(FieldStorage):
         #print "  getRSS(url)"
         #print "  setTimeout(\"rss_reload(\'\" + url + \"\')\", 10000);}"
         #print "</script>"
-    
+
     def sub_header(self):
         if self.refresh:
             print "<meta http-equiv=\"refresh\" content=\"" + str(self.refresh_value) + "; URL=telecaster.py\">"
@@ -166,7 +166,7 @@ class WebView(FieldStorage):
             power_info = "<span style=\"color: green\">secteur</span>"
         else:
             power_info = ""
-            
+
         if self.acpi.percent() == 127:
             batt_charge = '<span style=\"color: green\">100 &#37;</span>'
         else:
@@ -229,12 +229,12 @@ class WebView(FieldStorage):
         self.casting = writing
         self.writing = casting
         self.refresh = False
-        
+
         self.header()
         self.javascript()
         self.sub_header()
         self.hardware_data()
-        
+
         print "<form method=\"POST\" action=\"telecaster.py\" name=\"formulaire\">"
         print "<div class=\"main\">"
         print "<table class=\"form\">"
@@ -283,14 +283,14 @@ class WebView(FieldStorage):
         self.writing = writing
         self.casting = casting
         self.refresh = True
-        
+
         self.header()
         self.sub_header()
-        
+
         print "<form method=\"POST\" action=\"telecaster.py\" name=\"formulaire\">"
-        
+
         self.hardware_data()
-        
+
         print "<div class=\"main\">"
         print "<table class=\"form\">"
         print "<TR><TH align=\"left\">Titre</TH><TD> : </TD><TD>"+self.title+"</TD></TR>"