fix some error.

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

diff --git a/rec10/trunk/src/auto_process.py b/rec10/trunk/src/auto_process.py
index d15bb02..a73313f 100644 (file)
--- a/rec10/trunk/src/auto_process.py
+++ b/rec10/trunk/src/auto_process.py
@@ -147,7 +147,7 @@ def check_process(path,title):
 def update_all_timeline_epg():
     now=datetime.datetime.now()
     et=now+datetime.timedelta(days=7)
-    update_timeline_epg(now.strftime("%Y-%m-%d %H:%M:%S"), etime.strftime("%Y-%m-%d %H:%M:%S"))
+    update_timeline_epg(now.strftime("%Y-%m-%d %H:%M:%S"), et.strftime("%Y-%m-%d %H:%M:%S"))
 def update_timeline_epg(btime,etime):
     update_timeline_epg_schedule(btime,etime)
     update_timeline_dup(btime,etime)
@@ -166,7 +166,7 @@ def update_timeline_epg_schedule(btime,etime):
                 else:
                     rec10d.rec10db.update_status_change_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "0")
             else:
-                rec10d.rec10db.update_status_change_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "0")
+                rec10d.rec10db.update_status_change_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "1")
         elif db['type']==recdblist.REC_RESERVE or db['type']==recdblist.REC_FINAL_RESERVE :
             ret=epgdb.searchtime2(db['title'], db['btime'],"5", db['chtxt'])
             if len(ret)>4 and len(ret[2])>18:
@@ -176,7 +176,7 @@ def update_timeline_epg_schedule(btime,etime):
                 else:
                     rec10d.rec10db.update_status_change_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "0")
             else:
-                rec10d.rec10db.update_status_change_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "0")
+                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)
     for db in dbl:

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 6c37981..9c4c4f7 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -47,7 +47,6 @@ 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:
@@ -448,14 +447,6 @@ 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=""):
         """
 
@@ -553,19 +544,6 @@ class DB_MySQL:
         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