fix rename miss.

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

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index a681a11..e7786a3 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/scan_ch.py b/rec10/trunk/src/scan_ch.py
index e94c3c2..3a982bd 100644 (file)
--- a/rec10/trunk/src/scan_ch.py
+++ b/rec10/trunk/src/scan_ch.py
@@ -25,36 +25,36 @@ def searchCh():
     for i in xrange(100,240):\r
         recdblist.printuft8ex(u"チャンネルスキャン:BSデジタル CH "+str(i), 200, 200)\r
         if checkTs(str(i))>0:\r
-            addCh(str(i),u"bs",str(i))\r
+            addCh(str(i),u"bs","BS")\r
     #スカパーe2!\r
     #http://www5e.biglobe.ne.jp/~kazu_f/digital-sat/trapon-nsat110.html\r
     #\r
     #CS1ネットワーク\r
     if checkTs("CS2")>0:\r
-        addCh("CS2","cs1","CS2")\r
+        addCh("CS2","cs1","CS")\r
     if checkTs("CS8")>0:\r
-        addCh("CS8","cs1","CS8")\r
+        addCh("CS8","cs1","CS")\r
     if checkTs("CS10")>0:\r
-        addCh("CS10","cs1","CS10")\r
+        addCh("CS10","cs1","CS")\r
     #CS2ネットワーク\r
     if checkTs("CS4")>0:\r
-        addCh("CS4","cs2","CS4")\r
+        addCh("CS4","cs2","CS")\r
     if checkTs("CS6")>0:\r
-        addCh("CS6","cs2","CS6")\r
+        addCh("CS6","cs2","CS")\r
     if checkTs("CS12")>0:\r
-        addCh("CS12","cs2","CS12")\r
+        addCh("CS12","cs2","CS")\r
     if checkTs("CS14")>0:\r
-        addCh("CS14","cs2","CS14")\r
+        addCh("CS14","cs2","CS")\r
     if checkTs("CS16")>0:\r
-        addCh("CS16","cs2","CS16")\r
+        addCh("CS16","cs2","CS")\r
     if checkTs("CS18")>0:\r
-        addCh("CS18","cs2","CS18")\r
+        addCh("CS18","cs2","CS")\r
     if checkTs("CS20")>0:\r
-        addCh("CS20","cs2","CS20")\r
+        addCh("CS20","cs2","CS")\r
     if checkTs("CS22")>0:\r
-        addCh("CS22","cs2","CS22")\r
+        addCh("CS22","cs2","CS")\r
     if checkTs("CS24")>0:\r
-        addCh("CS24","cs2","CS24")\r
+        addCh("CS24","cs2","CS")\r
 def checkTs(ch):\r
     tv2ts.tv2b25ts(os.path.join(tmppath,"ch_"+str(ch)+".ts"), ch, "1")\r
     if os.path.exists(os.path.join(tmppath,"ch_"+str(ch)+".ts")):\r