OSDN Git Service
(root)
/
rec10
/
rec10-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix to recognize etime before btime(this would be a fault of iEPG).
[rec10/rec10-git.git]
/
Rec10WEB
/
trunk
/
src
/
rec10web.py
diff --git
a/Rec10WEB/trunk/src/rec10web.py
b/Rec10WEB/trunk/src/rec10web.py
index
fb210a5
..
a758781
100644
(file)
--- a/
Rec10WEB/trunk/src/rec10web.py
+++ b/
Rec10WEB/trunk/src/rec10web.py
@@
-73,12
+73,12
@@
if f.getfirst('etime'):
et=datetime.datetime.strptime(etime,"%Y-%m-%d %H:%M:%S")
if bt !="":
delt=et-bt
et=datetime.datetime.strptime(etime,"%Y-%m-%d %H:%M:%S")
if bt !="":
delt=et-bt
- dt=delt.days*24*60+delt.seconds
+ dt=delt.days*24*60
*60
+delt.seconds
if dt<0:
dd=datetime.timedelta(days=1)
et=et+dd
etime=et.strftime("%Y-%m-%d %H:%M:%S")
if dt<0:
dd=datetime.timedelta(days=1)
et=et+dd
etime=et.strftime("%Y-%m-%d %H:%M:%S")
- if dt<-1*24*60
+1
:
+ if dt<-1*24*60
*60
:
d1=datetime.datetime(bt.year,0,0)
d2=datetime.datetime(bt.year+1,0,0)
dd=d2-d1
d1=datetime.datetime(bt.year,0,0)
d2=datetime.datetime(bt.year+1,0,0)
dd=d2-d1