From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Sat, 4 Dec 2010 00:51:12 +0000 (+0000)
Subject: fix rename miss.
X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=commitdiff_plain;h=88f6afa362b91a287fb4b32d270cce8e45f3e49a

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
--- 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
--- 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):
         recdblist.printuft8ex(u"チャンネルスキャン:BSデジタル CH "+str(i), 200, 200)
         if checkTs(str(i))>0:
-            addCh(str(i),u"bs",str(i))
+            addCh(str(i),u"bs","BS")
     #スカパーe2!
     #http://www5e.biglobe.ne.jp/~kazu_f/digital-sat/trapon-nsat110.html
     #
     #CS1ネットワーク
     if checkTs("CS2")>0:
-        addCh("CS2","cs1","CS2")
+        addCh("CS2","cs1","CS")
     if checkTs("CS8")>0:
-        addCh("CS8","cs1","CS8")
+        addCh("CS8","cs1","CS")
     if checkTs("CS10")>0:
-        addCh("CS10","cs1","CS10")
+        addCh("CS10","cs1","CS")
     #CS2ネットワーク
     if checkTs("CS4")>0:
-        addCh("CS4","cs2","CS4")
+        addCh("CS4","cs2","CS")
     if checkTs("CS6")>0:
-        addCh("CS6","cs2","CS6")
+        addCh("CS6","cs2","CS")
     if checkTs("CS12")>0:
-        addCh("CS12","cs2","CS12")
+        addCh("CS12","cs2","CS")
     if checkTs("CS14")>0:
-        addCh("CS14","cs2","CS14")
+        addCh("CS14","cs2","CS")
     if checkTs("CS16")>0:
-        addCh("CS16","cs2","CS16")
+        addCh("CS16","cs2","CS")
     if checkTs("CS18")>0:
-        addCh("CS18","cs2","CS18")
+        addCh("CS18","cs2","CS")
     if checkTs("CS20")>0:
-        addCh("CS20","cs2","CS20")
+        addCh("CS20","cs2","CS")
     if checkTs("CS22")>0:
-        addCh("CS22","cs2","CS22")
+        addCh("CS22","cs2","CS")
     if checkTs("CS24")>0:
-        addCh("CS24","cs2","CS24")
+        addCh("CS24","cs2","CS")
 def checkTs(ch):
     tv2ts.tv2b25ts(os.path.join(tmppath,"ch_"+str(ch)+".ts"), ch, "1")
     if os.path.exists(os.path.join(tmppath,"ch_"+str(ch)+".ts")):