From b157c326fa2139529eee14781f39c9d3ab65668a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 17 Aug 2020 18:06:18 +0200 Subject: Start moving stuff out from output. --- module/server/routes.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'module/server/routes.scm') diff --git a/module/server/routes.scm b/module/server/routes.scm index 6c1d1fcd..142e0477 100644 --- a/module/server/routes.scm +++ b/module/server/routes.scm @@ -25,8 +25,7 @@ :use-module (vcomponent) :use-module (vcomponent search) :use-module (datetime) - ;; :use-module (output html) - :use-module (output ical) + :use-module (vcomponent ical output) :autoload (vcomponent instance) (global-event-object) @@ -194,7 +193,7 @@ ;; *TOP* node is a required part of the sxml. (let ((event - ((@ (vcomponent parse xcal) sxcal->vcomponent) + ((@ (vcomponent xcal parse) sxcal->vcomponent) (catch 'parser-error (lambda () (move-to-namespace @@ -336,7 +335,7 @@ ;; Look into changing how events carry around their ;; parent information, possibly splitting "source parent" ;; and "program parent" into different fields. - (lambda () (sxml->xml ((@ (output xcal) vcomponent->sxcal) it))))) + (lambda () (sxml->xml ((@ (vcomponent xcal output) vcomponent->sxcal) it))))) (return (build-response code: 404) (format #f "No component with UID=~a found." uid)))) -- cgit v1.2.3