diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-03-23 00:34:28 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-03-23 00:36:21 +0100 |
| commit | ae47899079a448b2d71101d4b21c8e9409d82e34 (patch) | |
| tree | 73fa1ec4d618d2a66650fee59b1e377cd7b3e40a /module/vcomponent/recurrence/generate.scm | |
| parent | Remove unused datetime->decimal-hour. (diff) | |
| download | calp-ae47899079a448b2d71101d4b21c8e9409d82e34.tar.gz calp-ae47899079a448b2d71101d4b21c8e9409d82e34.tar.xz | |
Remove deprecated get-time.
Diffstat (limited to 'module/vcomponent/recurrence/generate.scm')
| -rw-r--r-- | module/vcomponent/recurrence/generate.scm | 39 |
1 files changed, 17 insertions, 22 deletions
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)) |