From aa44c16ce953c090b2eb3ce580c60fa8934a7720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Thu, 30 Apr 2020 19:17:35 +0200 Subject: Change call signature for [gs]etf. --- module/output/html.scm | 8 ++++---- module/output/ical.scm | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'module/output') diff --git a/module/output/html.scm b/module/output/html.scm index 740be7b9..702d229d 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -748,8 +748,8 @@ (define-method (html-chunked-main count start-date chunk-length) - (define calendars (getf app 'calendars)) - (define events (getf app 'event-set)) + (define calendars (getf 'calendars)) + (define events (getf 'event-set)) ;; TODO This still doesn't account for PWD, file existing but is of ;; wrong type, html directory existing but static symlink missing, @@ -786,8 +786,8 @@ (define-method (html-table-main count start-date) - (define calendars (getf app 'calendars)) - (define events (getf app 'event-set)) + (define calendars (getf 'calendars)) + (define events (getf 'event-set)) ;; TODO same file creation as in html-chunked-main (stream-for-each diff --git a/module/output/ical.scm b/module/output/ical.scm index 8388bfc1..098d4e90 100644 --- a/module/output/ical.scm +++ b/module/output/ical.scm @@ -153,7 +153,7 @@ (add-child! cal event) (awhen (prop (attr* event 'DTSTART) 'TZID) - (add-child! cal (zoneinfo->vtimezone (getf (current-app) 'zoneinfo) it))) + (add-child! cal (zoneinfo->vtimezone (getf 'zoneinfo) it))) (unless (attr event 'UID) (set! (attr event 'UID) @@ -202,7 +202,7 @@ CALSCALE:GREGORIAN\r (let ((tz-names (get-tz-names events))) (for-each component->ical-string ;; TODO we realy should send the earliest event from each timezone here. - (map (lambda (name) (zoneinfo->vtimezone (getf (current-app) 'zoneinfo) name (car events))) + (map (lambda (name) (zoneinfo->vtimezone (getf 'zoneinfo) name (car events))) tz-names))) (for-each component->ical-string events) @@ -218,4 +218,4 @@ CALSCALE:GREGORIAN\r ;; We just dump all repeating objects, since it's much cheaper to do ;; it this way than to actually figure out which are applicable for ;; the given date range. - (getf (current-app) 'repeating-events)))) + (getf 'repeating-events)))) -- cgit v1.2.3