fix logo error.

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

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index fdd775a..667be02 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -97,6 +97,7 @@ class DB_MySQL:
             updatetime DATETIME,\
             status TINYINT,\
             visible TINYINT DEFAULT 1,\
+            logo0 BLOB,\
             logo1 BLOB,\
             logo2 BLOB,\
             logo3 BLOB,\
@@ -316,17 +317,6 @@ class DB_MySQL:
                       (status, bctype)\
                       )
         self.close_db(db)
-    def update_status_by_bctype_epg_ch(self, bctype, status):
-        db = self.connect_db()
-        db[1].execute("\
-        UPDATE epg_ch \
-        SET \
-        status=%s , \
-        updatetime=now() \
-        WHERE bctype = %s", \
-                      (status, bctype)\
-                      )
-        self.close_db(db)
     def update_logostatus_by_bctype_epg_ch(self,bctype,logostatus):
         db = self.connect_db()
         db[1].execute("\

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index 1264564..770b5c8 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -49,4 +49,5 @@ if __name__ == "__main__":
     #rec10d.rec10db.update_db_100to101()
     #recque.searchRecQue(recpath)
     #print chdb.updateLogo()
-    epgdb.updateLogo_bc("te23")
\ No newline at end of file
+    #epgdb.updateLogo_bc("bs")
+    ""
\ No newline at end of file

diff --git a/rec10/trunk/src/ts2epg.py b/rec10/trunk/src/ts2epg.py
index 43d911f..f6f4abb 100644 (file)
--- a/rec10/trunk/src/ts2epg.py
+++ b/rec10/trunk/src/ts2epg.py
@@ -27,13 +27,20 @@ def writeLogoEpgXML(pout, ch):
     """\r
     tsを取得してepgの入ったxmlとして書き出す\r
     """\r
-    timet = "1200"\r
+    timet = "600"\r
+    if re.search(u'CS', ch):\r
+        timet = "10"\r
+    elif len(ch)>2:\r
+        timet = "1200"\r
     writeEpgXMLTime(pout, ch ,timet,islogo=1)\r
 def writeEpgXMLTime(pout, ch ,times,islogo=0):\r
     """\r
     指定された時間分tsを取得してepgの入ったxmlとして書き出す\r
     """\r
-    recdblist.addCommonlogEX(u"通常","write_time(ts2epg.py)",u"Ts-EPG XML書き出し処理開始" ,u"CH:"+ch,log_level=500)\r
+    if islogo==0:\r
+        recdblist.addCommonlogEX(u"通常","write_time(ts2epg.py)",u"Ts-EPG XML書き出し処理開始" ,u"CH:"+ch,log_level=500)\r
+    elif islogo==1:\r
+        recdblist.addCommonlogEX(u"通常","write_time(ts2epg.py)",u"Ts-EPG LOGO : XML書き出し処理開始" ,u"CH:"+ch,log_level=500)\r
     timet = times\r
     if re.search(u'CS', ch):\r
         mode = "/CS"\r
@@ -54,4 +61,5 @@ def writeEpgXMLTime(pout, ch ,times,islogo=0):
     recdblist.addCommonlogEX(u"通常", "write_time(ts2epg.py)", exe,"",log_level=500)\r
     unicode(commands.getoutput(exe),'utf-8','ignore')\r
     time.sleep(10)\r
+    os.remove(pout+ ".ts")\r
 \r

diff --git a/rec10/trunk/src/xml2db_dom.py b/rec10/trunk/src/xml2db_dom.py
index 53bf75f..fd41840 100644 (file)
--- a/rec10/trunk/src/xml2db_dom.py
+++ b/rec10/trunk/src/xml2db_dom.py
@@ -41,9 +41,9 @@ def writeMultiCHDB(chlists):
 def writeMultiLogoDB(logolists):\r
     #[type,sv,pngdata]\r
     for type,sv,pngdata in logolists:\r
-        chtxt=chdb.searchCHFromCsch(sv)\r
+        chtxt=chdb.searchCHFromCsch(sv)['chtxt']\r
         if len(chtxt)>0:\r
-            rec10d.rec10db.change_visible_epg_ch(chtxt,type,pngdata)\r
+            rec10d.rec10db.change_logodata_epg_ch(chtxt,type,pngdata)\r
 def xml2db_dom(xmlpath, bctype):#bctypeは放送種別で'TE'(地デジ)BS,CSがある。地デジの場合は te数字 が入る\r
     dtb=datetime.datetime.now()\r
     dom=xml.dom.minidom.parse(file(xmlpath))\r