From 1b3acd107ec9825576c78a07211954861a5ecb24 Mon Sep 17 00:00:00 2001 From: Brit Butler Date: Tue, 23 Sep 2014 17:38:59 -0400 Subject: [PATCH] Fix feed handling bug backwards compatibly. No name changes. --- examples/example.coleslawrc | 2 +- src/feeds.lisp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/example.coleslawrc b/examples/example.coleslawrc index 6a3691a..25d0f3f 100644 --- a/examples/example.coleslawrc +++ b/examples/example.coleslawrc @@ -14,7 +14,7 @@ (:tag-index "tag/~a") (:month-index "date/~a") (:numeric-index "~d") - (:standard-feed "~a.xml") + (:feed "~a.xml") (:tag-feed "tag/~a.xml")) :sitenav ((:url "http://redlinernotes.com/" :name "Home") (:url "http://twitter.com/redline6561" :name "Twitter") diff --git a/src/feeds.lisp b/src/feeds.lisp index a0aaeef..4bebcb0 100644 --- a/src/feeds.lisp +++ b/src/feeds.lisp @@ -2,25 +2,25 @@ ;;; Atom and RSS Feeds -(defclass feed () ((format :initarg :format :reader feed-format))) +(defclass base-feed () ((format :initarg :format :reader feed-format))) -(defclass standard-feed (index feed) ()) +(defclass feed (index base-feed) ()) -(defmethod discover ((doc-type (eql (find-class 'standard-feed)))) +(defmethod discover ((doc-type (eql (find-class 'feed)))) (let ((content (by-date (find-all 'post)))) (dolist (format '(rss atom)) - (let ((feed (make-instance 'standard-feed :format format + (let ((feed (make-instance 'feed :format format :content (take-up-to 10 content) :slug (format nil "~(~a~)" format)))) (add-document feed))))) -(defmethod publish ((doc-type (eql (find-class 'standard-feed)))) - (dolist (feed (find-all 'standard-feed)) +(defmethod publish ((doc-type (eql (find-class 'feed)))) + (dolist (feed (find-all 'feed)) (write-document feed (theme-fn (feed-format feed) "feeds")))) ;;; Tag Feeds -(defclass tag-feed (index feed) ()) +(defclass tag-feed (index base-feed) ()) (defmethod discover ((doc-type (eql (find-class 'tag-feed)))) (let ((content (by-date (find-all 'post))))