fix auto_jbk bugs.

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

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 51b1967..a585bb0 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -522,8 +522,8 @@ class DB_MySQL:
         dbr = db[1].execute("SELECT \
         type, chtxt, title, btime, etime, deltatime ,deltaday ,opt ,epgbtime ,epgetime ,epgtitle ,epgduplicate ,epgchange ,counter\
         FROM timeline \
-        WHERE btime > %s AND \
-        etime < %s",(btime,etime))
+        WHERE btime >= %s AND \
+        etime <= %s",(btime,etime))
         dbl = db[1].fetchall()
         self.close_db(db)
         #recdblist.printutf8(dbl)

diff --git a/rec10/trunk/src/readme.txt b/rec10/trunk/src/readme.txt
index 6c601cc..e7c4518 100644 (file)
--- a/rec10/trunk/src/readme.txt
+++ b/rec10/trunk/src/readme.txt
@@ -1,7 +1,7 @@
 ###########################################
 #     Rec10 -Ts Recording system-         #
 #                          Ver.0.9.9      #
-# 2011/01/01         Yukikaze & long.inus #
+# 2011/02/02         Yukikaze & long.inus #
 #  Copyright (C) 2009-2011 Yukikaze      #
 ###########################################
 
@@ -71,7 +71,7 @@ chdata.pyを実行してください(python chdata.py)
 yukikaze.jp@gmail.com
 
 [History]
-11// 0.9.9
+11/02/02 0.9.9
 BonTsDemuxを最新版へ(nogui化によりXvfbが不要)
 一部CSチャンネルの追加
 epg_chを変更(ontvの削除)

diff --git a/rec10/trunk/src/recdb.py b/rec10/trunk/src/recdb.py
index 6fc5b30..4c92fc8 100644 (file)
--- a/rec10/trunk/src/recdb.py
+++ b/rec10/trunk/src/recdb.py
@@ -76,8 +76,12 @@ def getAllJbkKeyword():
     return rec10d.rec10db.select_all_in_auto_jbk_key()\r
 def checkDuplicated(title,chtxt,epgbtime,epgetime):\r
     tl=rec10d.rec10db.select_byepgtime_all_timeline(epgbtime,epgetime)\r
+    nel=rec10d.rec10db.select_bytime_all_timeline(epgbtime, epgetime)\r
     dup=0\r
     for t in tl:\r
         if t["title"]==title and t["chtxt"]==chtxt:\r
             dup=1\r
+    for t in nel:\r
+        if t["title"]==title and t["chtxt"]==chtxt:\r
+            dup=1\r
     return dup\r

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index d53b5e1..6628427 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -284,11 +284,10 @@ def search_keyword(key):
                                 recdb.reserveReckey(recdblist.REC_RESERVE,titlet,chtxtt, btimet, etimet,topt)
                     except Exception, inst:
                         recdblist.addCommonlogEX("Error", "search_keyword_auto_jbk(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
-                else:
-                    try:
-                        recdb.reserveAutoKeyword(chtxtt, titlet, btimet, etimet)
-                    except Exception, inst:
-                        recdblist.addCommonlogEX("Error", "search_keyword(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
+                try:
+                    recdb.reserveAutoKeyword(chtxtt, titlet, btimet, etimet)
+                except Exception, inst:
+                    recdblist.addCommonlogEX("Error", "search_keyword(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
 def type_reserve(typetxt,chtxt,title,bt,et,opt):
     btime = bt.strftime("%Y-%m-%d %H:%M:%S")
     etime = et.strftime("%Y-%m-%d %H:%M:%S")