From 53c8299576598ed75368ed9f0dad8a3bfeea71d4 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 17 Apr 2008 05:25:11 -0500
Subject: [PATCH] Fix RSS

---
 extra/rss/rss-tests.factor | 5 +++--
 extra/rss/rss.factor       | 5 +----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/extra/rss/rss-tests.factor b/extra/rss/rss-tests.factor
index 77364d73e7..7523d0509f 100755
--- a/extra/rss/rss-tests.factor
+++ b/extra/rss/rss-tests.factor
@@ -1,4 +1,5 @@
-USING: rss io kernel io.files tools.test io.encodings.utf8 ;
+USING: rss io kernel io.files tools.test io.encodings.utf8
+calendar ;
 IN: rss.tests
 
 : load-news-file ( filename -- feed )
@@ -35,7 +36,7 @@ IN: rss.tests
             "http://example.org/2005/04/02/atom"
             "\n         <div xmlns=\"http://www.w3.org/1999/xhtml\">\n           <p><i>[Update: The Atom draft is finished.]</i></p>\n         </div>\n       "
 
-            "2003-12-13T08:29:29-04:00"
+            T{ timestamp f 2003 12 13 8 29 29 -4 }
         }
     }
 } ] [ "extra/rss/atom.xml" resource-path load-news-file ] unit-test
diff --git a/extra/rss/rss.factor b/extra/rss/rss.factor
index 017160e7e1..2e735d2f06 100644
--- a/extra/rss/rss.factor
+++ b/extra/rss/rss.factor
@@ -7,9 +7,6 @@ USING: xml.utilities kernel assocs xml.generator
     http.client namespaces xml.generator hashtables
     calendar.format accessors continuations ;
 
-: ?children>string ( tag/f -- string/f )
-    [ children>string ] [ f ] if* ;
-
 : any-tag-named ( tag names -- tag-inside )
     f -rot [ tag-named nip dup ] with find 2drop ;
 
@@ -26,7 +23,7 @@ C: <entry> entry
     [ "link" tag-named children>string ] keep
     [ "description" tag-named children>string ] keep
     f "date" "http://purl.org/dc/elements/1.1/" <name>
-    tag-named ?children>string rfc3339>timestamp
+    tag-named dup [ children>string rfc3339>timestamp ] when
     <entry> ;
 
 : rss1.0 ( xml -- feed )