retdb = rec10web_dbMySQL.DB_MySQL(dbname=dbn, host=dbh, user=dbu, passwd=dbpwd, port=dbport)
return retdb
def getRecDate():
- dl = database.select_all_rectime()
+ dl = database.select_all_timeline()
recdata = "id,type,chtxt,title,btime,etime,deltaday,opt\n"
#print dl
for d in dl:
f.write(recdata)
f.close()
def getchtxt():
- dl = database.select_all_chdata()
+ dl = database.select_all_epg_ch()
chopt = ""
- for bctype, ontv, chtxt, ch, csch, updatetime in dl:
- chdisplay = ""
- for bctype, channel, display in database.select_by_ontv_ch(ontv):
- chdisplay = display
- if chdisplay != "":
- chopt = chopt + "<option value=" + chtxt + ">" + chdisplay + "</option>\n "
+ for bctype, ontv, chtxt, chname, ch, csch, updatetime in dl:
+ chopt = chopt + "<option value=" + chtxt + ">" + chname + "</option>\n "
return chopt
def edit_date(id):
- ret = database.select_by_id_rectime(id)
+ ret = database.select_by_id_timeline(id)
return ret[0]
def reserv_recday(keyword, chtxt, btime, etime, deltatime, opt, deltaday, day):
"""
MaxS = MaxS-tsnum[1]
bctype = ""
rett = ""
- bctypegetdb = database.select_by_chtxt_chdata(chtxt)
+ bctypegetdb = database.select_by_chtxt_epg_ch(chtxt)
for bctypet, ontvt, chtxtt, cht, cscht, updatetimet in bctypegetdb:
bctype = bctypet
if (type == "rec") or (type == "res") or (type == "key") or (type == "keyevery"):
elif bctype.find("te") > -1:
MaxT = MaxT-1
if MaxS > -1 and MaxT > -1:
- database.add_rectime(type=type, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, deltaday=deltaday, opt=opt)
+ database.add_timeline(type=type, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, deltaday=deltaday, opt=opt)
rett = ""
else:
rett = "over"
return 0
else:
return 1
- dls = database.schedule_rectime(btime, etime)
+ dls = database.schedule_timeline(btime, etime)
times = []
btd = datetime.datetime(*time.strptime(btime, "%Y-%m-%d %H:%M:%S")[:-3])
etd = datetime.datetime(*time.strptime(etime, "%Y-%m-%d %H:%M:%S")[:-3])
et1 = times[i + 1]
btime1 = bt1.strftime("%Y-%m-%d %H:%M:%S")
etime1 = et1.strftime("%Y-%m-%d %H:%M:%S")
- ret1 = database.count_schedule_rectime(btime1, etime1)
+ ret1 = database.count_schedule_timeline(btime1, etime1)
if retcount[0] < ret1[0]:
retcount[0] = ret1[0]
if retcount[1] < ret1[1]:
MaxS = MaxS-tsnum[1]
bctype = ""
rett = ""
- for dl in database.select_by_chtxt_chdata(chtxt):
+ for dl in database.select_by_chtxt_epg_ch(chtxt):
bctype = dl[0]
if (type == "rec") or (type == "res") or (type == "key") or (type == "keyevery"):
if bctype.find("cs") > -1:
elif bctype.find("te") > -1:
MaxT = MaxT-1
if MaxS > -1 and MaxT > -1:
- database.del_by_id_rectime(id)
- database.add_rectime(type=type, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, deltaday=deltaday, opt=opt)
+ database.del_by_id_timeline(id)
+ database.add_timeline(type=type, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, deltaday=deltaday, opt=opt)
else:
rett = "over"
return rett
ss = s.split(",")
for st in ss:
if st != "":
- database.del_by_id_rectime(st)
+ database.del_by_id_timeline(st)
htmdate = mode_del()
elif mode == "edit-exec":
if (chtxt != "")and(title != "")and(btime != "")and(etime != "")and(opts != ""):
def close_db(self, db):
db[1].close()
db[0].close()
- def select_by_ontv_ch(self, ontv):
- db = self.connect_db()
- ret = db[1].execute("SELECT bctype,channel,display FROM ch WHERE channel= %s ", (ontv, ))
- ret = db[1].fetchall()
- self.close_db(db)
- return ret
- def select_all_rectime(self):
+ def select_all_timeline(self):
db = self.connect_db()
recdata = []
- dl = db[1].execute("SELECT id,type,chtxt,title,btime,etime,deltatime,deltaday,opt FROM rectime")
+ dl = db[1].execute("SELECT id,type,chtxt,title,btime,etime,deltatime,deltaday,opt FROM timeline")
dls = db[1].fetchall()
for id, typet, chtxt, title, btime, etime, deltatime, deltaday, opt in dls:
ret = {}
recdata.append(ret)
self.close_db(db)
return recdata
- def select_by_chtxt_rectime(self, chtxt):
+ def select_by_chtxt_timeline(self, chtxt):
db = self.connect_db()
recdata = []
- dl = db[1].execute("SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt FROM rectime WHERE chtxt = %s ", (chtxt, ))
+ dl = db[1].execute("SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt FROM timeline WHERE chtxt = %s ", (chtxt, ))
d = db[1].fetchall()
for typet, chtxt, title, btime, etime, deltatime, deltaday, opt in d:
ret = {}
recdata.append(ret)
self.close_db(db)
return recdata
- def select_by_id_rectime(self, id):
+ def select_by_id_timeline(self, id):
db = self.connect_db()
recdata = []
- dl = db[1].execute("SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt FROM rectime WHERE id = %s ", (id, ))
+ dl = db[1].execute("SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt FROM timeline WHERE id = %s ", (id, ))
d = db[1].fetchall()
for typet, chtxt, title, btime, etime, deltatime, deltaday, opt in d:
ret = {}
recdata.append(ret)
self.close_db(db)
return recdata
- def select_all_chdata(self):
- db = self.connect_db()
- ret = db[1].execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata")
- ret = db[1].fetchall()
- self.close_db(db)
- return ret
- def select_by_chtxt_chdata(self, chtxt):
- db = self.connect_db()
- ret = db[1].execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata WHERE chtxt=%s", (chtxt, ))
- ret = db[1].fetchall()
- self.close_db(db)
- return ret
- def select_by_station_chdata(self, station):
+ def select_all_epg_ch(self):
db = self.connect_db()
- ret = db[1].execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata WHERE station=%s", (station, ))
+ ret = db[1].execute("SELECT bctype,ontv,chtxt,chname,ch,csch,updatetime FROM epg_ch")
ret = db[1].fetchall()
self.close_db(db)
return ret
- def select_by_station_name_chdata(self, station_name):
+ def select_by_chtxt_epg_ch(self, chtxt):
db = self.connect_db()
- db[1].execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata WHERE station_name=%s", (station_name, ))
+ ret = db[1].execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM epg_ch WHERE chtxt=%s", (chtxt, ))
ret = db[1].fetchall()
self.close_db(db)
return ret
- def add_rectime(self, type="", chtxt="", title="", btime="", etime="", deltatime="", deltaday="", opt=""):
+ def add_timeline(self, type="", chtxt="", title="", btime="", etime="", deltatime="", deltaday="", opt=""):
db = self.connect_db()
- db[1].execute('INSERT IGNORE INTO rectime (type,chtxt,title,btime,etime,deltatime,deltaday,opt) values (%s,%s,%s,%s,%s,%s,%s,%s)', (type, chtxt, title, btime, etime, deltatime, deltaday, opt))
+ db[1].execute('INSERT IGNORE INTO timeline (type,chtxt,title,btime,etime,deltatime,deltaday,opt) values (%s,%s,%s,%s,%s,%s,%s,%s)', (type, chtxt, title, btime, etime, deltatime, deltaday, opt))
#db.commit()
self.close_db(db)
- def schedule_rectime(self, btime, etime):
+ def schedule_timeline(self, btime, etime):
db = self.connect_db()
- dbexe = "SELECT type,chdata.bctype,rectime.chtxt,rectime.title,rectime.btime,rectime.etime FROM rectime INNER JOIN chdata ON rectime.chtxt=chdata.chtxt"
- dbexe = dbexe + " WHERE NOT( ( rectime.etime <= %s ) OR ( rectime.btime >= %s ) )"
+ dbexe = "SELECT type,epg_ch.bctype,timeline.chtxt,timeline.title,timeline.btime,timeline.etime FROM timeline INNER JOIN epg_ch ON timeline.chtxt=epg_ch.chtxt"
+ dbexe = dbexe + " WHERE NOT( ( timeline.etime <= %s ) OR ( timeline.btime >= %s ) )"
db[1].execute(dbexe, (btime, etime))
rets = []
for typet, bctypet, chtxtt, titlet, btimet, etimet in db[1].fetchall():
rets.append(ret)
self.close_db(db)
return rets
- def count_schedule_rectime(self, btime, etime):
+ def count_schedule_timeline(self, btime, etime):
"""
count rectasknum
return [te num,bs/cs num]
"""
db = self.connect_db()
- dbexe = "SELECT type,chdata.bctype,rectime.chtxt,rectime.title FROM rectime INNER JOIN chdata ON rectime.chtxt=chdata.chtxt"
- dbexe = dbexe + " WHERE NOT( ( rectime.etime <= %s ) OR ( rectime.btime >= %s ) )"
+ dbexe = "SELECT type,epg_ch.bctype,chtxt,title FROM timeline INNER JOIN epg_ch ON timeline.chtxt=epg_ch.chtxt"
+ dbexe = dbexe + " WHERE NOT( ( timeline.etime <= %s ) OR ( timeline.btime >= %s ) )"
Srec = 0
Trec = 0
db[1].execute(dbexe, (btime, etime))
for typet, bctypet, chtxtt, titlet in db[1].fetchall():
- if (typet == "rec") or (typet == "res") or (typet == "key") or (typet == "keyevery"):
+ if (typet == "reserve_flexible") or (typet == "reserve_fixed") or (typet == "search_today") or (typet == "search_everyday"):
if bctypet.find("cs") > -1:
Srec = Srec + 1
elif bctypet.find("bs") > -1:
Trec = Trec + 1
self.close_db(db)
return [Trec, Srec]
- def del_by_id_rectime(self, id):
+ def del_by_id_timeline(self, id):
db = self.connect_db()
- db[1].execute('DELETE FROM rectime WHERE id=' + id)
+ db[1].execute('DELETE FROM timeline WHERE id=' + id)
self.close_db(db)
def new_iepg(self):
db = self.connect_db()
try:
- db[1].execute("CREATE TABLE iepg \
+ db[1].execute("CREATE TABLE in_iepg \
(\
id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,\
station VARCHAR(200) NOT NULL,\
self.close_db(db)
def add_iepg(self, station, chtxt):
db = self.connect_db()
- db[1].execute('INSERT IGNORE INTO iepg (station,chtxt) VALUES (%s,%s)', (station, chtxt))
+ db[1].execute('INSERT IGNORE INTO in_iepg (station,chtxt) VALUES (%s,%s)', (station, chtxt))
self.close_db(db)
def del_by_id_iepg(self, num):
db = self.connect_db()
- db[1].execute("DELETE FROM iepg \
+ db[1].execute("DELETE FROM in_iepg \
WHERE id=%s", \
(num, ))
self.close_db(db)
db[1].execute("\
SELECT \
id,station,chtxt \
- FROM iepg \
+ FROM in_iepg \
WHERE chtxt=%s "\
, (chtxt, ))
retall = db[1].fetchall()
db[1].execute("\
SELECT \
id,station,chtxt \
- FROM iepg \
+ FROM in_iepg \
WHERE station=%s "\
, (station, ))
retall = db[1].fetchall()
db[1].execute("\
SELECT \
id,station,chtxt \
- FROM iepg "\
+ FROM in_iepg "\
)
retall = db[1].fetchall()
self.close_db(db)