fix auto_process.

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

diff --git a/rec10/trunk/src/auto_process.py b/rec10/trunk/src/auto_process.py
index 7a12b01..188fa07 100644 (file)
--- a/rec10/trunk/src/auto_process.py
+++ b/rec10/trunk/src/auto_process.py
@@ -180,14 +180,17 @@ def update_timeline_dup(epgbtime,epgetime):
     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'])
-            bctypet=chdb.chtxtsearch(db['chtxt'])['bctype']
-            if bctypet.find("cs") > -1 or bctypet.find("bs") > -1 :
-                if dbn[1]>status.getRecordingMax()[1]:
-                    rec10d.rec10db.update_status_dup_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "1")
+            try:
+                bctypet=chdb.chtxtsearch(db['chtxt'])['bctype']
+                if bctypet.find("cs") > -1 or bctypet.find("bs") > -1 :
+                    if dbn[1]>status.getRecordingMax()[1]:
+                        rec10d.rec10db.update_status_dup_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "1")
+                    else:
+                        rec10d.rec10db.update_status_dup_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "0")
                 else:
-                    rec10d.rec10db.update_status_dup_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "0")
-            else:
-                if dbn[0]>status.getRecordingMax()[0]:
-                    rec10d.rec10db.update_status_dup_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "1")
-                else:
-                    rec10d.rec10db.update_status_dup_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "0")
\ No newline at end of file
+                    if dbn[0]>status.getRecordingMax()[0]:
+                        rec10d.rec10db.update_status_dup_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "1")
+                    else:
+                        rec10d.rec10db.update_status_dup_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "0")
+            except:
+                ""
\ No newline at end of file

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index a8a1d55..27fcd61 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -333,7 +333,7 @@ class DB_MySQL:
             auto_opt VARCHAR(20),\
             auto_del_tmp TINYINT\
             )')
-            db[1].execute("INSERT IGNORE into in_settings VALUE (0,0,\"G\",1)")
+            db[1].execute("INSERT IGNORE into in_settings VALUE (0,0,\"H\",1)")
         except:
             ""
         self.close_db(db)
@@ -1111,6 +1111,8 @@ class DB_MySQL:
         self.close_db(db)
     def update_db_to93(self):
         db = self.connect_db()
+        self.drop_in_settings()
+        self.new_in_settings()
         db[1].execute("\
         ALTER TABLE timeline ADD epgtitle VARCHAR(100),\
         ADD epgbtime DATETIME,\