fix epg refreshing bugs.(use xml which used before with no error)

[rec10/rec10-git.git] / rec10 / trunk / src / dbSQLite.py

diff --git a/rec10/trunk/src/dbSQLite.py b/rec10/trunk/src/dbSQLite.py
index f8adc02..fc0d4ec 100644 (file)
--- a/rec10/trunk/src/dbSQLite.py
+++ b/rec10/trunk/src/dbSQLite.py
@@ -11,7 +11,7 @@ class DB_SQLite():
     dbpath=""
     def __init__(self,dbpath):
         self.dbpath = dbpath
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         try:
             db.execute('create table rectime (type TEXT,chtxt TEXT,title TEXT,btime TEXT,etime TEXT,deltatime TEXT,deltaday TEXT,opt TEXT,id INTEGER PRIMARY KEY,UNIQUE(type,chtxt,title,btime,deltaday))')
         except:
@@ -29,7 +29,7 @@ class DB_SQLite():
     def close_db(self,db):
         db.close()
     def new_chdata(self):
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         try:
             db.execute('drop table chdata')
             db.commit()
@@ -42,58 +42,58 @@ class DB_SQLite():
         db.commit()
         self.close_db(db)
     def add_chdata(self,bctype, ontv, chtxt, ch, csch, station, station_name,updatetime):
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         db.execute('insert into chdata values (?,?,?,?,?,?,?,datetime(?))',(bctype,ontv,chtxt,ch,csch,station,station_name,updatetime))
         db.commit()
         self.close_db(db)
     def select_by_ontv_chdata(self,ontv):
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         dbexe=db.execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata WHERE ontv = ?",(ontv,))
         ret=dbexe.fetchall()
         self.close_db(db)
         return ret
     def select_by_chtxt_chdata(self,chtxt):
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         dbexe=db.execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata WHERE chtxt = ?",(chtxt,))
         ret=dbexe.fetchall()
         self.close_db(db)
         return ret
     def select_by_bctype_chdata(self,bctype):
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         dbexe=db.execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata WHERE bctype = ?",(bctype,))
         ret=dbexe.fetchall()
         self.close_db(db)
         return ret
     def select_by_ch_chdata(self,ch):
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         dbexe=db.execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata WHERE ch = ?",(ch,))
         ret=dbexe.fetchall()
         self.close_db(db)
         return ret
     def select_all_chdata(self):
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         dbexe=db.execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata ")
         ret=dbexe.fetchall()
         self.close_db(db)
         return ret
     def select_get_update_chdata(self,dhour):
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         dbexe=db.execute("SELECT bctype,chtxt FROM chdata WHERE updatetime < datetime(\'now\',\'localtime\',\'-"+dhour+" hours\')")
         ret=dbexe.fetchall()
         self.close_db(db)
         return ret
     def update_by_bctype_chdata(self,bctype):
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         db.execute("UPDATE chdata SET updatetime=datetime(\'now\',\'localtime\') WHERE bctype = ?",(bctype,))
         db.commit()
         self.close_db(db)
     def update_by_bctype_and_chtxt_chdata(self,bctype,chtxt):
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         db.execute("UPDATE chdata SET updatetime=datetime(\'now\',\'localtime\') WHERE bctype = ? AND chtxt = ?",(bctype,chtxt))
         db.commit()
         self.close_db(db)
     def add_rectime(self,type="", chtxt="", title="", btime="", etime="", deltatime="", deltaday="", opt=""):
-        db = self.connect_db(120)
+        db = self.connect_db(240)
         db.execute('insert into rectime (type,chtxt,title,btime,etime,deltatime,deltaday,opt) values (?,?,?,datetime(?),datetime(?),?,?,?)', (type, chtxt, title, btime, etime, deltatime, deltaday, opt))
         db.commit()
         self.close_db(db)
@@ -101,12 +101,12 @@ class DB_SQLite():
         """
         
         """
-        db=self.connect_db(120)
+        db=self.connect_db(240)
         db.execute("delete from rectime where type = ? AND title = ? AND chtxt = ? AND btime = datetime(?)", (type, title, chtxt, btime))
         db.commit()
         self.close_db(db)
     def select_all_rectime(self):
-        db=self.connect_db(120)
+        db=self.connect_db(240)
         recdata=[]
         for typet, chtxt, title, btime, etime, deltatime, deltaday, opt in db.execute("SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt FROM rectime"):
             ret={}
@@ -129,7 +129,7 @@ class DB_SQLite():
         self.close_db(db)
         return recdata
     def select_bytime_rectime(self,dhour):
-        db=self.connect_db(120)
+        db=self.connect_db(240)
         recdatum=[]
         for typet, chtxt, title, btime, etime, deltatime, deltaday, opt in db.execute("SELECT type, chtxt, title, DATETIME(btime), DATETIME(etime), deltatime ,deltaday ,opt FROM rectime WHERE btime < datetime(\'now\',\'localtime\',\'+" + dhour + " hours\') AND btime >datetime(\'now\',\'localtime\',\'-" + dhour + " hours\')"):
             ret={}
@@ -152,12 +152,12 @@ class DB_SQLite():
         self.close_db(db)
         return recdatum
     def delete_old_rectime(self,dhour):
-        db=self.connect_db(120)
+        db=self.connect_db(240)
         db.execute("DELETE FROM rectime WHERE NOT ( type = ? OR type = ? ) AND btime < datetime(\'now\',\'localtime\',\'-" + dhour + " hours\')", (recdb.REC_MISS_ENCODE, recdb.REC_KEYWORD_EVERY_SOME_DAYS))
         db.commit()
         self.close_db(db)
     def new_tv(self,bctype):
-        db=self.connect_db(120)
+        db=self.connect_db(240)
         try:
             db.execute("delete from tv where bctype = ?", (bctype,))
         except:
@@ -182,7 +182,7 @@ class DB_SQLite():
         db.commit()
         self.close_db(db)
     def select_by_title_tv(self,title):
-        db=self.connect_db(120)
+        db=self.connect_db(240)
         ret=[]
         for ch, title, start, stop in db.execute("SELECT channel,title,start,stop FROM tv WHERE title LIKE \"%"+titletxt+"%\""):
             btime=start.replace(" +0900","")
@@ -197,14 +197,14 @@ class DB_SQLite():
         self.close_db(db)
         return ret
     def select_by_time_ngram_tv(self,btime,etime,chtxt):
-        db=self.connect_db(120)
+        db=self.connect_db(240)
         dbexe="SELECT chdata.chtxt,title,start,stop FROM tv INNER JOIN chdata WHERE chdata.ontv=tv.channel AND start >= ? AND start <= ? AND chdata.chtxt=?"
         dbcmd=db.execute(dbexe,(btime,etime,chtxt))
         retall=dbcmd.fetchall()
         self.close_db(db)
         return retall
     def new_ch(self,bctype):
-        db=self.connect_db(120)
+        db=self.connect_db(240)
         try:
             db.execute("delete from ch where bctype = ?",(bctype,))
         except: