From 10b78b457cb68a8f2fc2b950345e05250fc9128e Mon Sep 17 00:00:00 2001
From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Mon, 6 Dec 2010 06:39:30 +0000
Subject: [PATCH] fix chscan.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@790 4e526526-5e11-4fc0-8910-f8fd03428081
---
 rec10/trunk/src/chdata.py  | 21 ++-------------------
 rec10/trunk/src/scan_ch.py |  1 -
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/rec10/trunk/src/chdata.py b/rec10/trunk/src/chdata.py
index 97e73cf..2e6e095 100644
--- a/rec10/trunk/src/chdata.py
+++ b/rec10/trunk/src/chdata.py
@@ -5,6 +5,7 @@
 import os.path
 import configreader
 import xml.dom.minidom
+import scan_ch
 
 import rec10d
 
@@ -16,24 +17,6 @@ def addCHlist(cl):
     if len(cl)>0:
         for c in cl:
             chAdd(c[0],c[1],c[2],c[3])
-def newChdata(bs,cs):
-    rec10d.rec10db.new_epg_ch()
-    addCHlist(getCHlist(os.path.join(path,"chlist.xml")))
-    if bs==1:
-        #bs放送の設定　全国共通のはず
-        addCHlist(getCHlist(os.path.join(path,"chlist_bs.xml")))
-    if cs==1:
-        #CS放送(スカパーe2)主に基本パックに入ってるものを中心に
-        chlistadd(getChList(os.path.join(path,"chlist_cs.xml")))
-def newChdataAll():
-    bs=0
-    cs=0
-    try:
-        bs=int(configreader.getConfEnv("bs"))
-        cs=int(configreader.getConfEnv("cs"))
-    except:
-        ""
-    newChdata(bs,cs)
 def getChList(xmlpath):
     dom=xml.dom.minidom.parse(file(xmlpath))
     chlist=[]
@@ -46,4 +29,4 @@ def getChList(xmlpath):
         chlist.append([bctype,ontv,chtxt,chd,csch])
     return chlist
 if __name__ == "__main__":
-    newChdataAll()
+    scan_ch.searchCh()
diff --git a/rec10/trunk/src/scan_ch.py b/rec10/trunk/src/scan_ch.py
index 8c4b81d..b744fdb 100644
--- a/rec10/trunk/src/scan_ch.py
+++ b/rec10/trunk/src/scan_ch.py
@@ -135,4 +135,3 @@ def checkB25Purchased(ch,logtxt):
         for chl in chlists:
             if chl['csch'] in upl:
                 chdb.changeCHShow(chl['chtxt'],"0")
-
-- 
2.11.0