Changeset 8676 for lang/gauche/oldtype

Timestamp:

04/02/08 22:06:22 (5 years ago)

Author:

kiyoka

Message:

Some refactoring of ##(timestamp utc) and #(since utc) command.

Location:

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

Files:

• format.scm (modified) (3 diffs)
• oldtype.kahua (modified) (6 diffs)
• util.kahua (modified) (4 diffs)

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

@@ -158 +158 @@
 ;;          (lineno      . LINENO)
 ;;          (latest-rate . NUMBER)
+;;          (rev         . COMMIT_REVISION_NUMBER)
+;;          (commit-utc  . COMMIT_UTC_SECONDS)
 ;;        )
 ;;        (TAG
@@ -200 +202 @@
                                             (car ann-of-line)))
                                       '((index . 5))))
+                     (rev         (if ann-of-line
+                                      (car ann-of-line)
+                                      #f))
+                     (info-of-line  (if rev
+                                        (assq-ref top rev)
+                                        #f))
+                     (commit-utc    (if info-of-line
+                                        (assq-ref (assq-ref (car info-of-line) 'date) 'utc)
+                                        0))
                      (latest-rate (assq-ref line-alist 'index)))
 
@@ -219 +230 @@
                              (committer     . ,(if ann-of-line
                                                    (assq-ref (cadr ann-of-line) 'user)
-                                                   'oldtype)))
+                                                   'oldtype))
+                             (rev           . ,rev)
+                             (commit-utc    . ,commit-utc)
+                             )
                             ,@(rec (sxml:content sxml) hctx)))
                          ((a)

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

@@ -78 +78 @@
 ;; utility : internal sxml format to highger-order-tag
 (define (sxml->higher-order-tag wikiname sxmls page-src)
-  (define _nbsp "\u00a0")
-  (define (space->nbsp string)
-    (regexp-replace-all #/ / string _nbsp))
   (let1 is-w3m (eq? 'w3m (oldtype-user-agent))
         (div/
@@ -109 +106 @@
                                                      (td/ "committer")
                                                      (td/ (assq-ref param 'committer)))
+                                                    (tr/
+                                                     (td/ "commit date")
+                                                     (td/ (string-append (oldtype:utc->date-string (assq-ref param 'commit-utc))
+                                                                         (oldtype:space->nbsp (oldtype:utc->ago-string (assq-ref param 'commit-utc))))))
+                                                    (tr/
+                                                     (td/ "commit revision")
+                                                     (td/ (assq-ref param 'rev)))
                                                     (tr/
                                                      (td/ "original-src")
@@ -138 +142 @@
                                              ((4)  (oldtype:icon-image 'new4))
                                              (else (if is-w3m
-                                                       (space->nbsp "  ")
+                                                       (oldtype:space->nbsp "  ")
                                                        (oldtype:icon-image 'new5))))))))
                                (_rest
@@ -169 +173 @@
                                                                (type "text")
                                                                (value (assq-ref param 'orig))))
-                                                      (space->nbsp "  ")
+                                                      (oldtype:space->nbsp "  ")
                                                       (input/ (@/
                                                                (type "button")
@@ -192 +196 @@
                                                   (oldtype:icon-image 'ul1)            (node-set (rec arg)))))
                               ((pre-ul2)     `(,@(span/
-                                                  _nbsp
+                                                  (oldtype:space->nbsp " ")
                                                   (oldtype:icon-image 'ul2)            (node-set (rec arg)))))
                               ((pre-ul3)     `(,@(span/
-                                                  _nbsp _nbsp
+                                                  (oldtype:space->nbsp "  ")
                                                   (oldtype:icon-image 'ul3)            (node-set (rec arg)))))
                               ((pre-ol1)     `(,@(span/
                                                   (oldtype:icon-image 'ol1)            (node-set (rec arg)))))
                               ((pre-ol2)     `(,@(span/
-                                                  _nbsp
+                                                  (oldtype:space->nbsp " ")
                                                   (oldtype:icon-image 'ol2)            (node-set (rec arg)))))
                               ((pre-ol3)     `(,@(span/ 
-                                                  _nbsp _nbsp
+                                                  (oldtype:space->nbsp "  ")
                                                   (oldtype:icon-image 'ol3)            (node-set (rec arg)))))
                               ((h1)          `(,@(h1/ (@/ (id "h1"))                   (node-set (rec arg)))))
@@ -236 +240 @@
               (cons
                (if string?
-                   (space->nbsp other)
+                   (oldtype:space->nbsp other)
                    other)
                (rec rest)))))))))

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

@@ -14 +14 @@
 (define (oldtype:static-image-path)
   (string-append "/kahua/" (kahua-worker-type) "/staticimg/"))
+
+(define (oldtype:space->nbsp string)
+  (define _nbsp "\u00a0")
+  (regexp-replace-all #/ / string _nbsp))
 
 
@@ -220 +224 @@
     
 
+;;
+;; Convert utc seconds to "2008-03-20 09:36 PM (+0900)"
+;;
+(define (oldtype:utc->date-string utc)
+  (if utc
+      (let1 d (time-utc->date
+               (seconds->time
+                utc))
+            (string-append (date->string d "~Y-~m-~d ~I:~M ~p (~z)")))
+      "*NoDateInformation*"))
+
+;;
+;; Convert utc seconds to "    (10 seconds ago)"
+;;
+(define (oldtype:utc->ago-string utc)
+  (if utc
+      (string-append
+       (format "~18,,,' @a"
+               (string-append
+                "("
+                (how-long-since utc)
+                " ago)")))
+      "*NoDateInformation*"))
+      
+
+
 (define (oldtype:format-macro expr)
   (let ((command (car expr))
@@ -298 +328 @@
       ((timestamp)
        (if (< 0 len)
-           (let* ((_utc    (car arg))
-                  (d (time-utc->date
-                      (seconds->time
-                       (string->number
-                        _utc)))))
-             (text/ (string-append (date->string d "~Y-~m-~d ~I:~M ~p (~z)"))))
+           (let1 _utc (car arg)
+                 (text/ (oldtype:utc->date-string (string->number _utc))))
            (p/ "!!Error : No argument ##(timestamp UTC) command")))
 
@@ -311 +337 @@
            (let1 _utc (car arg)
                  (text/ 
-                  (format "(~a ago)"
-                          (string-append
-                           (how-long-since 
-                            (string->number
-                             _utc))))))
+                  (oldtype:space->nbsp
+                   (oldtype:utc->ago-string (string->number _utc)))))
            (p/ "!!Error : No argument ##(since UTC) command")))