Changeset 13617

Timestamp:

06/10/08 21:03:22 (5 years ago)

Author:

kiyoka

Message:

Improved RSS feed feature.

Location:

lang/gauche/oldtype/trunk

Files:

• Kahua/oldtype/oldtype/oldtype.kahua (modified) (7 diffs)
• Kahua/oldtype/oldtype/page.scm (modified) (2 diffs)
• Kahua/oldtype/oldtype/util.scm (modified) (2 diffs)
• src/test.scm (modified) (1 diff)

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

@@ -114 +114 @@
                 (get-text-list oldtype-page)))))
             ""
-            #f
             ))))
    nodeset))
@@ -276 +275 @@
 
 
-(define (standard-page wikiname barcode nodes first-line rss-flag)
+(define (standard-page wikiname barcode nodes first-line)
   (html/ (head/ (title/ (string-append wikiname " / " first-line))
                 (link/ (@/ (rel "stylesheet") (type "text/css")
@@ -282 +281 @@
                 (link/ (@/ (rel "stylesheet") (type "text/css")
                            (href (string-append "/kahua/" (kahua-worker-type) "/import/tooltips.css"))))
-                (when/ rss-flag
-                       (link/ (@/ (rel "alternate") (type "application/rss+xml")
-                                  (href (string-append "/get-rss/" wikiname )))))
+                (link/ (@/ (rel "alternate") (type "application/rss+xml")
+                           (href (string-append "/get-rss/" wikiname ))))
                 (script/ (@/ (src (string-append "/kahua/" (kahua-worker-type) "/import/prototype.js"))      (type "text/javascript")))
                 (script/ (@/ (src (string-append "/kahua/" (kahua-worker-type) "/import/scriptaculous.js"))  (type "text/javascript")))
@@ -363 +361 @@
          (if oldtype-page
              (oldtype-first-line oldtype-page)
-             "")
-         (if oldtype-page
-             (get-rss-entry-pages oldtype-page)
-             #f))))
+             ""))))
 
 
@@ -379 +374 @@
 ;; get-rss entry
 (define (gen-rss/ base-url index-page entry-pages)
-  (let ((wikiname       (name-of index-page))
-        (build-date-utc (last
-                         (sort
-                          (map
-                           (lambda (e)
-                             (utc-of
-                              (get-latest-log
-                               (timeline-of e))))
-                           entry-pages)))))
+  (let* ((wikiname       (name-of index-page))
+         (entry-pages    (if (null? entry-pages)
+                             (list index-page)
+                             entry-pages))
+         (build-date-utc (last
+                          (sort
+                           (map
+                            (lambda (e)
+                              (utc-of
+                               (get-latest-log
+                                (timeline-of e))))
+                            entry-pages)))))
     (rss/ (@/ (version "2.0"))
           (channel/
@@ -393 +391 @@
            (link/                 (string-append base-url "show-page/" wikiname))
            (description/          (oldtype-first-line index-page))
-           (lastBuildDate/        (oldtype:utc->date-string build-date-utc))
+           (lastBuildDate/        (oldtype:utc->RFC822-date-string build-date-utc))
            (docs/                 "http://blogs.law.harvard.edu/tech/rss")
            (generator/            (string-append "OldType version " *oldtype-version*))
@@ -406 +404 @@
                                                        (string-append "#" (number->string lineno))
                                                        "")))
-                 (pubDate/          (oldtype:utc->date-string
+                 (pubDate/          (oldtype:utc->RFC822-date-string
                                      (utc-of
                                       (get-latest-log timeline)))))))

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

@@ -34 +34 @@
 
 (define-module oldtype.page
+  (use srfi-1)
   (use util.list)
   (use oldtype.log)
@@ -146 +147 @@
 
 (define-method get-rss-entry-pages ((self <oldtype-page>))
-  (filter
-   (lambda (x)
-     x)
-   (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))))
+  (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)))
 
 

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

@@ -54 +54 @@
           oldtype:date-string->date-alist
           oldtype:utc->date-string
+          oldtype:utc->RFC822-date-string
           oldtype:utc->ago-string
           oldtype:grouping-blog-entries
@@ -242 +243 @@
 
 ;;
+;; Convert utc seconds to "2008-03-20T18:36:00+00:00" RFC822
+;;
+(define (oldtype:utc->RFC822-date-string utc)
+  (sys-strftime "%Y-%m-%dT%H:%M:%S+00:00" (sys-gmtime utc)))
+
+
+;;
 ;; Convert utc seconds to "    (10 seconds ago)"
 ;;

lang/gauche/oldtype/trunk/src/test.scm

@@ -307 +307 @@
             (lambda ()
               (get-latest-lines oldtype-timeline)))
-            
+
+      (test "The page that doesn't have RSS data."
+            '()
+            (lambda ()
+              (get-rss-entry-pages 
+               (oldtype:load-page "" "Entry1"))))
+
       (test-end)