From 1edff09cfd01957bbb9db7041726f9e708bb9115 Mon Sep 17 00:00:00 2001
From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Sun, 4 Oct 2009 11:23:13 +0000
Subject: [PATCH 1/1] fix status double counting bug.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@171 4e526526-5e11-4fc0-8910-f8fd03428081
---
 rec10/trunk/src/dbMySQL.py | 13 +++++++------
 rec10/trunk/src/tester.py  |  7 ++++---
 rec10/trunk/src/tv2ts.py   | 16 ++++++++--------
 rec10/trunk/src/xml2db.py  |  6 +++++-
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index bf7fb5a..258dcf8 100644
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -404,29 +404,30 @@ class DB_MySQL:
             stop  VARCHAR(30),\
             title VARCHAR(100),\
             exp VARCHAR(200),\
+            category VARCHAR(100),\
             UNIQUE unitv(bctype,channel,start,stop,title)\
             )")
         except:
             ""
         #db.commit()
         self.close_db(db)
-    def add_tv(self, bctype, channel, start, stop, title, desc):
+    def add_tv(self, bctype, channel, start, stop, title, desc, category):
         db = self.connect_db()
         db[1].execute('\
         INSERT IGNORE INTO tv \
-        VALUES (%s,%s,%s,%s,%s,%s)', \
-                      (bctype, channel, start, stop, title, desc))
+        VALUES (%s,%s,%s,%s,%s,%s,%s)', \
+                      (bctype, channel, start, stop, title, desc, category))
         #db.commit()
         self.close_db(db)
     def add_multi_tv(self, tvlists):
         """
-        tvlists is (bctype,channel,start,stop,title,desc) lists.
+        tvlists is (bctype,channel,start,stop,title,desc,category) lists.
         """
         db = self.connect_db()
         db[1].executemany('\
         INSERT IGNORE INTO tv \
-        (bctype,channel,start,stop,title,exp) \
-        values(%s,%s,%s,%s,%s,%s)', \
+        (bctype,channel,start,stop,title,exp,category) \
+        values(%s,%s,%s,%s,%s,%s,%s)', \
                           tvlists)
         #db.commit()
         self.close_db(db)
diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index e031f2f..0e12e4a 100644
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -46,7 +46,8 @@ if __name__ == "__main__":
     #status.changeBSCSRecording(1)
     #print rec10d.rec10db.select_all_status()
     #status.changeBSCSRecording(-1)
-    print rec10d.rec10db.select_all_status()
-    print str(status.getBSCSRecording())
-    print str(status.getTERecording())
+    #print rec10d.rec10db.select_all_status()
+    #print str(status.getBSCSRecording())
+    #print str(status.getTERecording())
+    xml2db.xml2db("te18.xml", "te20")
     ""
\ No newline at end of file
diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py
index 8af8b14..af19b7a 100644
--- a/rec10/trunk/src/tv2ts.py
+++ b/rec10/trunk/src/tv2ts.py
@@ -11,15 +11,15 @@ import configreader
 import status
 mypath = str(os.path.dirname(os.path.abspath(__file__))) + "/"
 def tv2tsmix(pout, ch, time):
-    if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
-        status.changeBSCSRecording(1)
-    else:
-        status.changeTERecording(1)
+    #if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
+    #    status.changeBSCSRecording(1)
+    #else:
+    #    status.changeTERecording(1)
     tv2b25ts(pout + ".b25", ch, time)
-    if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
-        status.changeBSCSRecording(-1)
-    else:
-        status.changeTERecording(-1)
+    #if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
+    #    status.changeBSCSRecording(-1)
+    #else:
+    #    status.changeTERecording(-1)
     b252tsmix(pout + ".b25", pout)
     if os.access(pout, os.F_OK):
         try:
diff --git a/rec10/trunk/src/xml2db.py b/rec10/trunk/src/xml2db.py
index d5c3eb1..a3d1c26 100644
--- a/rec10/trunk/src/xml2db.py
+++ b/rec10/trunk/src/xml2db.py
@@ -87,11 +87,15 @@ def end_element(name):
             ustop = unicode(xmldate['programme:stop'].replace(" +0900", ""))
             utitle = unicode(xmldate['title'].replace(",", "-"))
             udesc = unicode(xmldate['desc'])
-            tvlists.append([ubctype, uch, ustart, ustop, utitle, udesc])
+            ucategory = unicode(xmldate['category'])
+            #print ucategory+"//"
+            tvlists.append([ubctype, uch, ustart, ustop, utitle, udesc,ucategory])
             #writetvDB(ubctype,uch,ustart,ustop,utitle,udesc)
             #print xmld
+            #print xmldate
             xmldate['title'] = ""
             xmldate['desc'] = ""
+            xmldate['category'] =""
             #xmldate[]
         if name == "tv":
             if len(chlists) > 0:
-- 
2.11.0