From 569c7db56b7ffd78c94ebdbfdc937c3cf127f8ab Mon Sep 17 00:00:00 2001 From: Jesse Gumm Date: Wed, 24 Feb 2016 13:09:33 -0600 Subject: [PATCH] Rework between/3, and add between/5 --- src/qdate.erl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qdate.erl b/src/qdate.erl index d6fe3ce..12d2db8 100644 --- a/src/qdate.erl +++ b/src/qdate.erl @@ -42,7 +42,8 @@ compare/2, compare/3, between/2, - between/3 + between/3, + between/5 ]). -export([ @@ -412,10 +413,13 @@ compare(A, Op, B) -> end. between(A, B) -> - between(unixtime(), A, B). + between(A, unixtime(), B). -between(Date, A, B) -> - compare(Date, '>=', A) andalso compare(Date, '=<', B). +between(A, Date, B) -> + between(A, '=<', Date, '=<', B). + +between(A, Op1, Date, Op2, B) -> + compare(A, Op1, Date) andalso compare(Date, Op2, B). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%% Date Math %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%