Changeset 14347 for lang/gauche

Timestamp:

06/21/08 20:12:51 (5 months ago)

Author:

kiyoka

Message:

Fixed invalid RSS 2.0 format. ( I have checked by FeedValidator?.org http://www.feedvalidator.org/ )

Location:

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype

Files:

• oldtype.kahua (modified) (4 diffs)
• page.scm (modified) (2 diffs)
• util.scm (modified) (1 diff)

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/oldtype.kahua

@@ -386 +386 @@
 
 ;; define elements for RSS 2.0
-(define-elements channel rss description lastBuildDate docs generator item pubDate author)
+(define-elements channel rss description lastBuildDate docs generator item pubDate author guid atom:link)
 
 ;; get-rss entry
@@ -402 +402 @@
                                 (timeline-of e))))
                             entry-pages)))))
-    (rss/ (@/ (version "2.0"))
+    (rss/ (@/ (version "2.0")
+              (xmlns:atom "http://www.w3.org/2005/Atom"))
           (channel/
+           (atom:link/
+            (@/ (href (string-append base-url "get-rss/" wikiname))
+                (rel  "self")
+                (type "application/rss+xml")))
            (title/                (string-append wikiname "::" (oldtype-first-line index-page)))
            (link/                 (string-append base-url "show-page/" wikiname))
@@ -413 +418 @@
             (lambda (e)
               (let* ((timeline (timeline-of e))
-                     (lineno   (- (last (get-latest-lines timeline)) 5)))
+                     (lineno   (- (last (get-latest-lines timeline)) 5))
+                     (uri      
+                      (string-append base-url "show-page/" (uri-encode-string (name-of e))
+                                     (if (< 1 lineno)
+                                         (string-append "#" (number->string lineno))
+                                         ""))))
                 (item/
                  (title/            (string-append (name-of e) "::" (oldtype-first-line e)))
-                 (description/      (string-join (get-plain-list e) "<br>"))
-                 (link/             (string-append base-url "show-page/" (uri-encode-string (name-of e))
-                                                   (if (< 1 lineno)
-                                                       (string-append "#" (number->string lineno))
-                                                       "")))
+                 (description/      (string-join (get-plain-list e) "\n"))
+                 (link/             uri)
+                 (guid/             uri)
                  (pubDate/          (oldtype:utc->RFC822-date-string
                                      (utc-of
                                       (get-latest-log timeline))))
-                 (author/           (committer-of (get-latest-log timeline))))))
+                 (author/       (committer-of (get-latest-log timeline))))))
             entry-pages)
            ))))
@@ -435 +443 @@
                 (format "http://~a/" (oldtype:get-arguments 'fqdn))
                 oldtype-page
-                         (filter-map
-                          (lambda (x)
-                            (oldtype:load-page (kahua-site-root) (cdr x)))
-                          (get-rss-entry-pages oldtype-page))))))
+                (filter-map
+                 (lambda (x)
+                   (oldtype:load-page (kahua-site-root) (cdr x)))
+                 (get-rss-entry-pages oldtype-page))))))
 
 

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/page.scm

@@ -35 +35 @@
 (define-module oldtype.page
   (use srfi-1)
+  (use srfi-13)
   (use util.list)
   (use oldtype.log)
@@ -161 +162 @@
 
 (define-method get-rss-entry-pages ((self <oldtype-page>))
-  (filter-map
-   (lambda (lineno)
-     (let* ((m (rxmatch #/\[\[([^\]|]+)\]\]/ (get-text self lineno)))
-            (wikiname
-             (if m
-                 (rxmatch-substring m 1)
-                 #f)))
-       (if m
-           (cons
-            lineno
-            wikiname)
-           #f)))
-   (_get-rss-lineno-list self)))
+  (delete-duplicates
+   (filter-map
+    (lambda (lineno)
+      (let* ((m (rxmatch #/\[\[([^\]|]+)\]\]/ (get-text self lineno)))
+             (wikiname
+              (if m
+                  (rxmatch-substring m 1)
+                  #f)))
+        (if m
+            (cons
+             lineno
+             wikiname)
+            #f)))
+    (_get-rss-lineno-list self))
+   (lambda (a b)
+     (string=
+      (cdr a)
+      (cdr b)))))
 
 

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/util.scm

@@ -239 +239 @@
 
 ;;
-;; Convert utc seconds to "2008-03-20T18:36:00+00:00" RFC822
+;; Convert utc seconds to RFC822 like "20 Mar 2008 18:36:00 +0000"
 ;;
 (define (oldtype:utc->RFC822-date-string utc)
-  (sys-strftime "%Y-%m-%dT%H:%M:%S+00:00" (sys-gmtime utc)))
-
+  (sys-strftime "%d %b %Y %H:%M:%S +0000" (sys-gmtime utc)))
 
 ;;