Index: src/macros.py |
=================================================================== |
--- src/macros.py (revision 5030) |
+++ src/macros.py (working copy) |
@@ -146,11 +146,15 @@ |
macro DAY(time) = ($floor(time / 86400000)); |
macro MONTH_FROM_TIME(time) = (MonthFromTime(time)); |
macro DATE_FROM_TIME(time) = (DateFromTime(time)); |
+macro NAN_OR_DATE_FROM_TIME(time) = (NUMBER_IS_NAN(time) ? time : DATE_FROM_TIME(time)); |
macro YEAR_FROM_TIME(time) = (YearFromTime(time)); |
macro HOUR_FROM_TIME(time) = (Modulo($floor(time / 3600000), 24)); |
macro MIN_FROM_TIME(time) = (Modulo($floor(time / 60000), 60)); |
+macro NAN_OR_MIN_FROM_TIME(time) = (NUMBER_IS_NAN(time) ? time : MIN_FROM_TIME(time)); |
macro SEC_FROM_TIME(time) = (Modulo($floor(time / 1000), 60)); |
+macro NAN_OR_SEC_FROM_TIME(time) = (NUMBER_IS_NAN(time) ? time : SEC_FROM_TIME(time)); |
macro MS_FROM_TIME(time) = (Modulo(time, 1000)); |
+macro NAN_OR_MS_FROM_TIME(time) = (NUMBER_IS_NAN(time) ? time : MS_FROM_TIME(time)); |
# Last input and last subject of regexp matches. |
macro LAST_SUBJECT(array) = ((array)[1]); |