implement to work "a bit after start resolution changing movie".

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@777 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 174d71d..4dd6346 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -1187,6 +1187,8 @@ class DB_MySQL:
         db[1].execute("\
         UPDATE timeline INNER JOIN epg_ch ON timeline.chtxt=epg_ch.chtxt SET timeline.chtxt=CONCAT(CONCAT(epg_ch.ch,'_'),epg_ch.csch)")
         db[1].execute("\
+        UPDATE timeline INNER JOIN epg_ch ON timeline.chtxt=epg_ch.chtxt SET timeline.chtxt=CONCAT('CS_',epg_ch.csch) where timeline.chtxt LIKE 'CS%'")
+        db[1].execute("\
         ALTER TABLE epg_ch DROP ontv")
         db[1].execute("\
         ALTER TABLE in_auto_jbk_key ADD auto TINYINT DEFAULT 0")

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index ee57bcf..6965e52 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -454,7 +454,7 @@ def type_keyword(typetxt,chtxt,title,bt,et,opt,deltatime):
             etimet = et.strftime("%Y-%m-%d %H:%M:%S")
             #try:
             recdb.del_reckey(typetxtnow, title, chtxt, btime)
-            recdb.rec_reckey(typetxtres, titlet, chtxtt, btimet, etimet, opt)
+            recdb.rec_reckey(typetxtres, titlet, chtxt, btimet, etimet, opt)
             recdb.rec_reclog(titlet, chtxtt, btimet, etimet, opt, exp,longexp,category)
             auto_rec.add_key(chtxt, titlet,exp+" "+longexp)
             auto_rec.add_key("ALL", titlet,exp+" "+longexp)
@@ -503,7 +503,7 @@ def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday,counter
             btimet = bt.strftime("%Y-%m-%d %H:%M:%S")
             etimet = et.strftime("%Y-%m-%d %H:%M:%S")
             #try:
-            recdb.keyreserv(titlet, chtxtt, btimet, etimet, deltatime, opt)
+            recdb.keyreserv(titlet, chtxt, btimet, etimet, deltatime, opt)
         else:
             recdb.keyreserv(title, chtxt, btime, etime, deltatime, opt)
 def type_decode_que(typetxt,chtxt,title,bt,et,opt):

diff --git a/rec10/trunk/src/tv2avi.py b/rec10/trunk/src/tv2avi.py
index 724d111..f9481f1 100644 (file)
--- a/rec10/trunk/src/tv2avi.py
+++ b/rec10/trunk/src/tv2avi.py
@@ -56,8 +56,8 @@ def b252ts(pout, chtxt, btime, etime, opt):
     status.changeB25Decoding(1)
     try:
         try:
-            ch=chdb.chtxtsearch(chtxt)['ch']
-            csch=chdb.chtxtsearch(chtxt)['csch']
+            ch=chtxt.split("_")[0]
+            csch=chtxt.split("_")[1]
         except:
             ch=0
             csch=0