@@ -21,7 +21,6 @@

 (load "rss.lisp")

-

 (defpackage :whitespace

   (:use #:cl #:whitespace.utils #:whitespace.rss #:whitespace.tables))

@@ -83,6 +83,36 @@

    (pub-date :accessor rss-item-pub-date :initarg :pub-date)

    (source :accessor rss-item-source  :initarg :source)))

+@export

+(defun make-rss-item (item)

+  (lquery:initialize item)

+  (flet ((dehtml (h) (plump:text (plump:parse h)))

+         (get-category-names (it) ;;; TODO: simplify this---Ask Shinmera on IRC

+           (if (not (equalp #() it))

+             (map 'vector

+                  (lambda (x) (plump:text (elt (plump:children x) 0)))

+                  it)

+             #())))

+    (let* ((content-encoded (lquery:$ (children) (tag-name "content:encoded")))

+

+           (description-element (default-when content-encoded (emptyp content-encoded)

+                                  (lquery:$ (children "description"))))

+

+           (description-raw (normalize-html

+                              (default-when description-element (emptyp description-element)

+                                (extract-text "description"))))

+

+           (description-munged (dehtml description-raw))

+           (category (get-category-names (lquery:$ "category"))))

+           ;(enclosure) --- TODO: implement comment / enclosure handling

+

+      (xml-text-bind (title link guid pub-date source comments)

+        (make-instance-from-symbols 'rss-item

+                                    item title link description-raw (description description-munged)

+                                    category guid pub-date source comments)))))

+      ;(setf (rss-item-enclosure result) enclosure)      -- TODO: comment/enclosure . . .

+

+

 @export

 (defun make-rss-feed (feed)

   (lquery:initialize feed)

@@ -146,15 +176,18 @@

   (:method ((obj rss-item) &optional feed)

    (with-slots (title link description-raw guid pub-date source) obj

      (get-id-for-object (rss_item_store guid) guid

-       (make-instance-from-symbols 'rss_item_store id title link (description description-raw)

-                                   guid pub-date source feed (fetch-defaults t))))))

+       (let ((result (make-instance-from-symbols 'rss_item_store title link (description description-raw)

+                                   guid pub-date source feed (fetch-defaults t))))

+         (unless (null id)

+           (setf (ris-id result) id))

+         result)))))

 (define-condition blarg () ((text :initarg text)))

 @export

 (defun get-feed-from-dao (rss-feed)

   (let ((feed-dao (get-dao-for rss-feed)))

     (list feed-dao

-          (error 'blarg :text (format t "~a~%" rss-feed))

+          ;(error 'blarg :text (format t "~a~%" rss-feed))

           (with-slots (items) rss-feed

             (iterate (for item in items)

                      (collect (get-dao-for item (slot-value feed-dao 'id))))))))

@@ -167,7 +200,13 @@

       (postmodern:upsert-dao feed)

       (mapcar #'postmodern:upsert-dao items))))

-; TODO: get rid of eval

+@export

+(defun store-item-dao (serialized-rss-item link)

+  (apply #'postmodern:make-dao

+         (list* 'rss_item_store :feed link

+                (iterate (for (k . v) in-sequence serialized-rss-item)

+                         (appending (list k v))))))

+

 @export

 (defun store-feed-dao (serialized-rss-feed &optional link)

   (declare (ignore link))

@@ -183,14 +222,6 @@

                              (slot-value rss_feed 'id)))

     rss_feed))

-@export

-(defun store-item-dao (serialized-rss-item link)

- (eval `(postmodern:make-dao

-          'rss_item_store

-          :feed ,link

-          ,@(iterate (for (k . v) in-sequence serialized-rss-item)

-                     (appending (list k v))))))

-

 (defun get-and-possibly-store-feed (rss-feed)

   "Given an rss-feed, return the db's feed-id, persisting it if it doesn't already exist."

   (postmodern:ensure-transaction

@@ -260,35 +291,6 @@

            html)

       ss)))

-@export

-(defun make-rss-item (item)

-  (lquery:initialize item)

-  (flet ((dehtml (h) (plump:text (plump:parse h)))

-         (get-category-names (it) ;;; TODO: simplify this---Ask Shinmera on IRC

-           (if (not (equalp #() it))

-             (map 'vector

-                  (lambda (x) (plump:text (elt (plump:children x) 0)))

-                  it)

-             #())))

-    (let* ((content-encoded (lquery:$ (children) (tag-name "content:encoded")))

-

-           (description-element (default-when content-encoded (emptyp content-encoded)

-                                  (lquery:$ (children "description"))))

-

-           (description-raw (normalize-html

-                              (default-when description-element (emptyp description-element)

-                                (extract-text "description"))))

-

-           (description-munged (dehtml description-raw))

-           (category (get-category-names (lquery:$ "category"))))

-           ;(enclosure) --- TODO: implement comment / enclosure handling

-

-      (xml-text-bind (title link guid pub-date source comments)

-        (make-instance-from-symbols 'rss-item

-                                    item title link description-raw (description description-munged)

-                                    category guid pub-date source comments)))))

-      ;(setf (rss-item-enclosure result) enclosure)      -- TODO: comment/enclosure . . .

-

 ; \o/

 ;  | Arrr