cur.close()
con.close()
except Exception, inst:
- recdblist.Commonlogex("Error", "init (dbMySQL.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=800)
+ if not (type(inst)==MySQLdb.ProgrammingError and (inst[0] == 1007 or inst[0]==1050)):
+ recdblist.Commonlogex("Error", "init (dbMySQL.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
db = self.connect_db()
try:
db[1].execute('\
(\
id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,\
keyword VARCHAR(200),\
+ auto TINYINT DEFAULT 0,\
+ opt VARCHAR(20),\
UNIQUE unijbk (keyword)\
)")
except:
def select_all_in_auto_jbk_key(self):
db = self.connect_db()
dbexe = db[1].execute("\
- SELECT keyword \
+ SELECT keyword,auto,opt \
FROM in_auto_jbk_key \
")
ret = []
self.drop_in_settings()
self.new_in_settings()
self.close_db(db)
- self.change_version_in_status("98")
\ No newline at end of file
+ self.change_version_in_status("98")
+ def update_db_98to99(self):
+ db = self.connect_db()
+ self.drop_in_settings()
+ self.new_in_settings()
+ db[1].execute("\
+ ALTER TABLE epg_ch DEL ontv")
+ db[1].execute("\
+ ALTER TABLE in_auto_jbk_key ADD auto TINYINT DEFAULT 0")
+ db[1].execute("\
+ ALTER TABLE in_auto_jbk_key ADD opt VARCHAR(20)")
+ self.close_db(db)
+ self.change_installed_in_status()#チャンネルスキャンをさせる
+ self.change_version_in_status("99")
\ No newline at end of file
def search_keyword(key):
tnow = datetime.datetime.now()
nows =tnow.strftime("%Y-%m-%d %H:%M:%S")
- for k in key:
+ for k,auto,opt in key:
recdatum = epgdb.searchtime_auto(k,nows, "144")
for recdata in recdatum:
if recdata[1] != "":
ett = datetime.datetime.strptime(etimet, "%Y-%m-%d %H:%M:%S")
btimet = btt.strftime("%Y-%m-%d %H:%M:%S")
etimet = ett.strftime("%Y-%m-%d %H:%M:%S")
- if status.getSettings_auto_jbk()==1:
- topt=status.getSettings_auto_opt()
+ #if status.getSettings_auto_jbk()==1:
+ if auto==1 or status.getSettings_auto_jbk()==1:
+ topt=opt
+ if len(topt)==0:
+ topt=status.getSettings_auto_opt()
try:
maxnum=0
if len(ch['ch'])>2:
elif len(ch)>2:
mode = "/BS"
else:
- mode = chdb.bctypesearch(u'te' + ch)['chtxt']
+ mode = str(chdb.bctypesearch(u'te' + ch)['ch'])
epgdump = configreader.getpath("epgdump")
if os.access(pout + ".ts", os.F_OK):
os.remove(pout + ".ts")