From ae47899079a448b2d71101d4b21c8e9409d82e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 23 Mar 2020 00:34:28 +0100 Subject: Remove deprecated get-time. --- module/vcomponent/recurrence/generate.scm | 39 ++++++++++++++----------------- module/vcomponent/recurrence/internal.scm | 2 +- 2 files changed, 18 insertions(+), 23 deletions(-) (limited to 'module/vcomponent') diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm index ac1402fa..ac8a6ad8 100644 --- a/module/vcomponent/recurrence/generate.scm +++ b/module/vcomponent/recurrence/generate.scm @@ -50,30 +50,25 @@ (let ((d (attr e 'DTSTART)) (i (interval r))) - (set! (attr e 'DTSTART) - ((if (date? d) - identity - (lambda (date) - (datetime - date: date - time: (time+ (get-time d) - (case (freq r) - ((SECONDLY) (time second: i)) - ((MINUTELY) (time minute: i)) - ((HOURLY) (time hour: i)) - (else (time))))))) - - (date+ (as-date d) - (case (freq r) - ((DAILY) (date day: i)) - ((WEEKLY) (date day: (* i 7))) - ((MONTHLY) (date month: i)) - ((YEARLY) (date year: i)) - (else (date)))))) + (let ((date-change (case (freq r) + ((DAILY) (date day: i)) + ((WEEKLY) (date day: (* i 7))) + ((MONTHLY) (date month: i)) + ((YEARLY) (date year: i)) + (else (date)))) + (time-change (case (freq r) + ((SECONDLY) (time second: i)) + ((MINUTELY) (time minute: i)) + ((HOURLY) (time hour: i)) + (else (time))))) + (set! (attr e 'DTSTART) + (if (date? d) + (date+ d date-change) + (datetime+ d (datetime date: date-change time: time-change))))) #; - (set! (zone-offset d) - (zone-offset (time-utc->date (date->time-utc d)))) + (set! (zone-offset d) ; + (zone-offset (time-utc->date (date->time-utc d)))) (let ((start (attr e 'DTSTART)) diff --git a/module/vcomponent/recurrence/internal.scm b/module/vcomponent/recurrence/internal.scm index 07fc4cf5..f7b49abc 100644 --- a/module/vcomponent/recurrence/internal.scm +++ b/module/vcomponent/recurrence/internal.scm @@ -38,7 +38,7 @@ (display (case field ;; TODO check over date/time/datetime here - ((until) ((@ (datetime util) time->string) it)) + ;; ((until) ((@ (datetime util) time->string) it)) (else it)) port))) (display ">" port)))))) -- cgit v1.2.3