diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-03-20 01:26:08 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-03-20 01:26:08 +0100 |
| commit | ad6a6bc6027f36f505a227bc73a0c3b720f47c87 (patch) | |
| tree | 730d9101ad366587c311e41efe9955d3cd94c34c /module/vcomponent/recurrence/generate.scm | |
| parent | Add print-and-return macro. (diff) | |
| download | calp-ad6a6bc6027f36f505a227bc73a0c3b720f47c87.tar.gz calp-ad6a6bc6027f36f505a227bc73a0c3b720f47c87.tar.xz | |
Start work on better wide html renderer.
Diffstat (limited to 'module/vcomponent/recurrence/generate.scm')
| -rw-r--r-- | module/vcomponent/recurrence/generate.scm | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm index f786a586..ba6257f8 100644 --- a/module/vcomponent/recurrence/generate.scm +++ b/module/vcomponent/recurrence/generate.scm @@ -81,11 +81,7 @@ (change (attr e 'X-HNH-DURATION))) (when end (set! (attr e 'DTEND) - ((cond - [(date? end) date+ ] - [(datetime? end) datetime+] - [else (error "End neither date nor datetime ~a" end)]) - start change)))))) + (datetime+ (as-datetime start) (datetime time: change))))))) e)) @@ -159,8 +155,9 @@ ;; The value type of dtstart and dtend must be the same ;; according to RFC 5545 3.8.2.2 (Date-Time End). (if (date? end) - (date-difference end (attr event 'DTSTART)) - (datetime-difference end (attr event 'DTSTART))))])) + (time second: (print-and-return (date-difference end (attr event 'DTSTART)))) + (time second: (print-and-return (datetime-difference end (attr event 'DTSTART))))))])) + (format (current-error-port) "duration = ~a~%" (attr event 'X-HNH-DURATION)) (if (attr event "RRULE") (recur-event-stream event (parse-recurrence-rule (attr event "RRULE") @@ -171,8 +168,9 @@ stream-null)))) (lambda (err . args) (format (current-error-port) - "\x1b[0;31mError\x1b[m while parsing recurrence rule (ignoring and continuing)~%~a ~a~%~a~%~%" + "\x1b[0;31mError\x1b[m while parsing recurrence rule (ignoring and continuing)~%~a ~s~%~a~%~%" err args (attr event 'X-HNH-FILENAME)) (stream ; event - )))) + ) + ))) |