commit 4a5228a3803cf285d220aedb5caa92b731375b62 Solene Rapenne <solene@perso.pw> 2018-05-15 09:26:20 +0200 Fixing gopher RSS url
generator.lisp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/generator.lisp b/generator.lisp index 3872847..1d40b9f 100644 --- a/generator.lisp +++ b/generator.lisp @@ -126,9 +126,9 @@ ;; get the converter object of "article" (defmacro with-converter(&body code) `(progn - (let ((converter-name - (or (article-converter article) - (getf *config* :default-converter)))) + (let ((converter-name (if (article-converter article) + (article-converter article) + (getf *config* :default-converter)))) (let ((converter-object (getf *converters* converter-name))) ,@code)))) @@ -228,7 +228,7 @@ ;; produce the code of a whole page with title+layout with the parameter as the content (defun generate-layout(body &optional &key (title nil)) (prepare "templates/layout.tpl" - (template "%%Title%%" (or title (getf *config* :title))) + (template "%%Title%%" (if title title (getf *config* :title))) (template "%%Tags%%" (get-tag-list)) (template "%%Body%%" body) output)) @@ -263,7 +263,7 @@ (subseq (getf (article-date article) :monthname) 0 3))) (template "%%Url%%" (if gopher - (format nil "gopher://~a:~d/0~a/~a.txt" + (format nil "gopher://~a:~d/0~a/article-~a.txt" (getf *config* :gopher-server) (getf *config* :gopher-port) (getf *config* :gopher-path)