From 29907cfc7cae60245db877208baab82097303b7e Mon Sep 17 00:00:00 2001 From: cquest Date: Sun, 19 Jun 2016 16:31:03 +0200 Subject: [PATCH] add YEAR to LAST/NEXT relative dates --- backend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend.py b/backend.py index cddda0e..233071f 100644 --- a/backend.py +++ b/backend.py @@ -126,10 +126,10 @@ class EventResource(BaseEvent): if when == 'YESTERDAY': event_start = "CURRENT_DATE - INTERVAL '1 DAY'" event_stop = "CURRENT_DATE" - m = re.match('(LAST|NEXT)(MONTH|WEEK|DAY|HOUR|MINUTE)',when) + m = re.match('(LAST|NEXT)(YEAR|MONTH|WEEK|DAY|HOUR|MINUTE)',when) if m is not None: when = m.group(1)+'1'+m.group(2)+'S' - m = re.match('(LAST|NEXT)([0-9]*)(MONTH|WEEK|MINUTE|HOUR|DAY)S',when) + m = re.match('(LAST|NEXT)([0-9]*)(YEAR|MONTHMONTH|WEEK|MINUTE|HOUR|DAY)S',when) if m is not None: if m.group(1) == 'LAST': event_start = "now() - INTERVAL '%s %s'" % m.group(2,3)