From 0fe21621c7ae4d413c6db7f8f8edefc1870a3160 Mon Sep 17 00:00:00 2001 From: Terry Truong Date: Mon, 26 Dec 2022 21:21:20 +1100 Subject: Fix filtering expression in server script --- backend/histplorer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backend') diff --git a/backend/histplorer.py b/backend/histplorer.py index 2c23b8e..6d1298e 100755 --- a/backend/histplorer.py +++ b/backend/histplorer.py @@ -228,8 +228,8 @@ def lookupEvents(start: HistDate | None, end: HistDate | None, ctg: str | None, params.append(startJdn) params.append(start.year if start.month == 1 and start.day == 1 else start.year + 1) if end is not None: - constraint = '((end IS NULL AND start <= ? AND fmt > 0 OR start <= ? AND fmt = 0) OR ' \ - '(end IS NOT NULL AND end <= ? AND fmt > 0 OR end <= ? AND fmt = 0))' + constraint = '(end IS NULL AND (start <= ? AND fmt > 0 OR start <= ? AND fmt = 0) OR ' \ + 'end IS NOT NULL AND (end <= ? AND fmt > 0 OR end <= ? AND fmt = 0))' if end.gcal is None: endJdn = gregorianToJdn(end.year, 1, 1) if end.year >= -4713 else -1 constraints.append(constraint) -- cgit v1.2.3