change db mode.

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

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index f6935cf..6c37981 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -47,6 +47,7 @@ class DB_MySQL:
             epgetime DATETIME,\
             epgduplicate TINYINT DEFAULT 0,\
             epgchange TINYINT DEFAULT 0,\
+            modify TINYINT DEFAULT 1,\
             UNIQUE uni (type,chtxt,title,btime,deltaday)\
             )')
         except:
@@ -447,6 +448,14 @@ class DB_MySQL:
                       (epgduplicate , type, chtxt, title, btime))
         ##db.commit()
         self.close_db(db)
+    def update_status_modify_timeline(self,type,chtxt,title,btime,modify):
+        db = self.connect_db()
+        db[1].execute('\
+        UPDATE timeline \
+        SET modify =%s \
+        WHERE type=%s AND chtxt=%s AND title=%s AND btime=%s ', \
+                      (epgduplicate , type, chtxt, title, btime))
+        self.close_db(db)
     def del_timeline(self, type="", title="", chtxt="", btime=""):
         """
 
@@ -529,6 +538,34 @@ class DB_MySQL:
         if dbr > 0:
             recdatum=self.getdic_timeline(dbl)
         return recdatum
+    def select_byepgtime_over_timeline(self,epgbtime,epgetime):
+        db = self.connect_db()
+        recdatum = []
+        #dbr=db[1].execute("SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt FROM rectime WHERE btime < DATE_SUB(now(),INTERVAL "+dminutes+" MINUTE ) AND btime > DATE_ADD(now(),INTERVAL "+dminutes+" MINUTE )")
+        dbr = db[1].execute("SELECT \
+        type, chtxt, title, btime, etime, deltatime ,deltaday ,opt ,epgbtime ,epgetime ,epgtitle ,epgduplicate ,epgchange \
+        FROM timeline \
+        WHERE (NOT(( timeline.epgetime <= %s )OR( timeline.epgbtime >= %s )))"\
+        ,(epgbtime,epgetime))
+        dbl = db[1].fetchall()
+        self.close_db(db)
+        #recdblist.printutf8(dbl)
+        if dbr > 0:
+            recdatum=self.getdic_timeline(dbl)
+        return recdatum
+    def select_bymodify_all_timeline(self):
+        db = self.connect_db()
+        recdatum = []
+        #dbr=db[1].execute("SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt FROM rectime WHERE btime < DATE_SUB(now(),INTERVAL "+dminutes+" MINUTE ) AND btime > DATE_ADD(now(),INTERVAL "+dminutes+" MINUTE )")
+        dbr = db[1].execute("SELECT \
+        type, chtxt, title, btime, etime, deltatime ,deltaday ,opt ,epgbtime ,epgetime ,epgtitle ,epgduplicate ,epgchange \
+        FROM timeline \
+        WHERE modify > 0")
+        dbl = db[1].fetchall()
+        self.close_db(db)
+        if dbr > 0:
+            recdatum=self.getdic_timeline(dbl)
+        return recdatum
     def count_schedule_timeline(self, btime, etime):
         """
         count rectasknum

diff --git a/rec10/trunk/src/epgdb.py b/rec10/trunk/src/epgdb.py
index 05f4c88..2f75f18 100644 (file)
--- a/rec10/trunk/src/epgdb.py
+++ b/rec10/trunk/src/epgdb.py
@@ -195,8 +195,8 @@ def count_epgschedule(epgbtime,epgetime):
             return 0
         else:
             return 1
-    dls = rec10d.rec10db.select_byepgtime_all_timeline(epgbtime, epgetime)
-    #print dls
+    dls = rec10d.rec10db.select_byepgtime_over_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")

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 15b8021..51f141c 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -453,7 +453,6 @@ def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday):
         etxt = et.strftime("%Y-%m-%d %H:%M:%S")
         recdb.everyreserv(title, chtxt, btxt, etxt, deltatime, opt, deltaday)
     elif dt < 120 * 60:
-        recdb.keyreserv(title, chtxt, btime, etime, deltatime, opt)
         recdb.del_reckey(recdblist.REC_KEYWORD_EVERY_SOME_DAYS, title, chtxt, btime)
         bt = bt + dd
         et = et + dd
@@ -461,7 +460,23 @@ def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday):
         etxt = et.strftime("%Y-%m-%d %H:%M:%S")
         recdb.everyreserv(title, chtxt, btxt, etxt, deltatime, opt, deltaday)
 
-
+        recdata = epgdb.searchtime2(title, btime, deltatime, chtxt)
+        if recdata[1] != "":
+            chtxtt = recdata[0]
+            titlet = recdata[1]
+            btimet = recdata[2]
+            etimet = recdata[3]
+            exp = recdata[4]
+            longexp = recdata[5]
+            category=recdata[6]
+            bt = datetime.datetime.strptime(btimet, "%Y-%m-%d %H:%M:%S")
+            et = datetime.datetime.strptime(etimet, "%Y-%m-%d %H:%M:%S")
+            btimet = bt.strftime("%Y-%m-%d %H:%M:%S")
+            etimet = et.strftime("%Y-%m-%d %H:%M:%S")
+            #try:
+            recdb.keyreserv(titlet, chtxtt, btimet, etimet, deltatime, opt)
+        else:
+            recdb.keyreserv(title, chtxt, btime, etime, deltatime, opt)
 def type_decode_que(typetxt,chtxt,title,bt,et,opt):
     btime = bt.strftime("%Y-%m-%d %H:%M:%S")
     etime = et.strftime("%Y-%m-%d %H:%M:%S")