DVB configures added.

[rec10/rec10-git.git] / Rec10WEB / trunk / src / rec10web_dbMySQL.py

diff --git a/Rec10WEB/trunk/src/rec10web_dbMySQL.py b/Rec10WEB/trunk/src/rec10web_dbMySQL.py
index 3ff27d2..38a7325 100644 (file)
--- a/Rec10WEB/trunk/src/rec10web_dbMySQL.py
+++ b/Rec10WEB/trunk/src/rec10web_dbMySQL.py
@@ -39,7 +39,7 @@ class DB_MySQL:
             ret['id'] = id
             ret['type'] = typet
             ret['chtxt'] = chtxt
-            ret['title'] = title.encode('utf-8')
+            ret['title'] = title
             btime = btime.strftime("%Y-%m-%d %H:%M:%S")
             etime = etime.strftime("%Y-%m-%d %H:%M:%S")
             ret['btime'] = btime
@@ -68,7 +68,7 @@ class DB_MySQL:
             ret = {}
             ret['type'] = typet
             ret['chtxt'] = chtxt
-            ret['title'] = title.encode('utf-8')
+            ret['title'] = title
             btime = btime.strftime("%Y-%m-%d %H:%M:%S")
             etime = etime.strftime("%Y-%m-%d %H:%M:%S")
             ret['btime'] = btime
@@ -95,7 +95,7 @@ class DB_MySQL:
             ret = {}
             ret['type'] = typet
             ret['chtxt'] = chtxt
-            ret['title'] = title.encode('utf-8')
+            ret['title'] = title
             btime = btime.strftime("%Y-%m-%d %H:%M:%S")
             etime = etime.strftime("%Y-%m-%d %H:%M:%S")
             ret['btime'] = btime
@@ -147,7 +147,7 @@ class DB_MySQL:
         return [te num,bs/cs num]
         """
         db = self.connect_db()
-        dbexe = "SELECT type,epg_ch.bctype,chtxt,title FROM timeline INNER JOIN epg_ch ON timeline.chtxt=epg_ch.chtxt"
+        dbexe = "SELECT type,epg_ch.bctype,timeline.chtxt,title FROM timeline INNER JOIN epg_ch ON timeline.chtxt=epg_ch.chtxt"
         dbexe = dbexe + " WHERE NOT( ( timeline.etime <= %s ) OR ( timeline.btime >= %s ) )"
         Srec = 0
         Trec = 0