tykayn/oedb-backend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more then 0-9 minutes/hours

Browse source
This commit is contained in:
cquest 2016-06-08 23:54:45 +02:00
parent 0a047d5a93
commit e641d46008
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
backend.py
View file

@ -130,24 +130,24 @@ class EventResource(BaseEvent):
event_stop = "CURRENT_DATE"
if when == 'NEXTHOUR':
when = 'NEXT1HOURS'
if re.search('NEXT[0-9]HOURS',when):
if re.search('NEXT[0-9]*HOURS',when):
event_start = "now()"
event_stop = "now() + INTERVAL '"+when[4]+" HOUR'"
event_stop = "now() + INTERVAL '"+when[4:-6]+" HOUR'"
if when == 'LASTHOUR':
when = 'LAST1HOURS'
if re.search('LAST[0-9]HOURS',when):
event_start = "now() - INTERVAL '"+when[4]+" HOUR'"
if re.search('LAST[0-9]*HOURS',when):
event_start = "now() - INTERVAL '"+when[4:-6]+" HOUR'"
event_stop = "now()"
if when == 'LASTMINUTE':
when = 'NEXT1MINUTES'
if re.search('LAST[0-9]MINUTES',when):
event_start = "now() - INTERVAL '"+when[4]+" MINUTE'"
if re.search('LAST[0-9]*MINUTES',when):
event_start = "now() - INTERVAL '"+when[4:-7]+" MINUTE'"
event_stop = "now()"
if when == 'NEXTMINUTE':
when = "NEXT1MINUTES"
if re.search('NEXT[0-9]MINUTES',when):
if re.search('NEXT[0-9]*MINUTES',when):
event_start = "now()"
event_stop = "now() + INTERVAL '"+when[4]+" MINUTE'"
event_stop = "now() + INTERVAL '"+when[4:-7]+" MINUTE'"
return event_start, event_stop