implement new db function.

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

diff --git a/rec10/trunk/src/auto_process.py b/rec10/trunk/src/auto_process.py
index 512251e..92994ed 100644 (file)
--- a/rec10/trunk/src/auto_process.py
+++ b/rec10/trunk/src/auto_process.py
@@ -70,8 +70,6 @@ def auto_check(path):
             file = os.path.split(fn)[1]
             title = os.path.splitext(file)[0]
             title = unicode(title,'utf-8')
-            
-            #print dbs
             ext = os.path.splitext(file)[1]
             if ext == ".b25":
                 title=title.replace(".ts","")
@@ -83,10 +81,6 @@ def auto_check(path):
                 if chtxtt!=None:
                     nchtxt=chtxtt
                 if proc=="b25":
-                    """chtxtt=rec10d.rec10db.select_chtxt_by_title_timeline_log(title)
-                    nchtxt=""
-                    if chtxtt!=None:
-                        nchtxt=chtxtt"""
                     add.append([recdblist.REC_AUTO_SUGGEST_DECODE,title,nchtxt])
                 elif proc=="ts":
                     add.append([recdblist.REC_AUTO_SUGGEST_ENCODE,title,nchtxt])
@@ -153,7 +147,6 @@ def check_process(path,title):
 def update_timeline_epg(btime,etime):
     update_timeline_epg_schedule(btime,etime)
     update_timeline_dup(btime,etime)
-    
 def update_timeline_epg_schedule(btime,etime):
     dbl=rec10d.rec10db.select_bytime_all_timeline(btime, etime)
     print dbl
@@ -172,7 +165,6 @@ def update_timeline_epg_schedule(btime,etime):
                 rec10d.rec10db.update_status_change_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "1")
 def update_timeline_dup(epgbtime,epgetime):
     dbl=rec10d.rec10db.select_byepgtime_all_timeline(epgbtime, epgetime)
-    print dbl
     for db in dbl:
         if db['type']==recdblist.REC_KEYWORD or db['type']==recdblist.REC_KEYWORD_EVERY_SOME_DAYS:
             dbn=epgdb.count_epgschedule(db['epgbtime'], db['epgetime'])

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 0c618a3..f6935cf 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -521,8 +521,8 @@ class DB_MySQL:
         dbr = db[1].execute("SELECT \
         type, chtxt, title, btime, etime, deltatime ,deltaday ,opt ,epgbtime ,epgetime ,epgtitle ,epgduplicate ,epgchange \
         FROM timeline \
-        WHERE epgbtime > %s AND \
-        epgetime < %s",(epgbtime,epgetime))
+        WHERE epgbtime >= %s AND \
+        epgetime <= %s",(epgbtime,epgetime))
         dbl = db[1].fetchall()
         self.close_db(db)
         #recdblist.printutf8(dbl)
@@ -574,10 +574,10 @@ class DB_MySQL:
         """
         db = self.connect_db()
         dbexe = "SELECT type,epg_ch.bctype,timeline.chtxt,title FROM timeline INNER JOIN epg_ch ON timeline.chtxt=epg_ch.chtxt"
-        dbexe = dbexe + " WHERE ((NOT(( timeline.epgetime <= %s )OR( timeline.epgbtime >= %s ))) OR ((timeline.epgbtime = %s) AND (timeline.epgetime = %s) ) )"
+        dbexe = dbexe + " WHERE (NOT(( timeline.epgetime <= %s )OR( timeline.epgbtime >= %s )))"
         Srec = 0
         Trec = 0
-        db[1].execute(dbexe, (epgbtime, epgetime,epgbtime,epgetime))
+        db[1].execute(dbexe, (epgbtime, epgetime))
         dbl=db[1].fetchall()
         for typet, bctypet, chtxtt, titlet in dbl:
             if (typet == recdblist.REC_RESERVE) or (typet == recdblist.REC_FINAL_RESERVE) or (typet == recdblist.REC_KEYWORD) or (typet == recdblist.REC_KEYWORD_EVERY_SOME_DAYS):

diff --git a/rec10/trunk/src/epgdb.py b/rec10/trunk/src/epgdb.py
index 89119d6..05f4c88 100644 (file)
--- a/rec10/trunk/src/epgdb.py
+++ b/rec10/trunk/src/epgdb.py
@@ -71,6 +71,7 @@ def searchtime2(titletxt, timet, deltatime, chtxt):
         etime = etime[0:4] + "-" + etime[4:6] + "-" + etime[6:8] + " " + etime[8:10] + ":" + etime[10:12] + ":00"
         bt = datetime.datetime.strptime(btime, "%Y-%m-%d %H:%M:%S")
         dt = bt-time
+        dt = abs(dt)
         dt = 24 * 60 * 60 * dt.days + dt.seconds + 1
         p = p * 90
         dt = 1000-1000 * dt / (7 * 24 * 60 * 60)
@@ -195,6 +196,7 @@ def count_epgschedule(epgbtime,epgetime):
         else:
             return 1
     dls = rec10d.rec10db.select_byepgtime_all_timeline(epgbtime, epgetime)
+    #print dls
     times = []
     btd = datetime.datetime.strptime(epgbtime, "%Y-%m-%d %H:%M:%S")
     etd = datetime.datetime.strptime(epgetime, "%Y-%m-%d %H:%M:%S")
@@ -211,7 +213,7 @@ def count_epgschedule(epgbtime,epgetime):
     times.sort(cmpare)
     times.reverse()
     retcount = [0, 0]
-    for i in xrange(0, len(times)-2, 1):
+    for i in xrange(0, len(times)-1, 1):
         bt1 = times[i]
         et1 = times[i + 1]
         epgbtime1 = bt1.strftime("%Y-%m-%d %H:%M:%S")
@@ -221,6 +223,9 @@ def count_epgschedule(epgbtime,epgetime):
             retcount[0] = ret1[0]
         if retcount[1] < ret1[1]:
             retcount[1] = ret1[1]
+        print bt1
+        print et1
+        print ret1
     return retcount
 def search_epgschedule(epgbtime,epgetime):
     """