Changeset 12573 in project


Ignore:
Timestamp:
11/22/08 22:21:29 (11 years ago)
Author:
azul
Message:

Fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/3/svnwiki-weblog/trunk/svnwiki-weblog.scm

    r12539 r12573  
    131131
    132132(define (weblog-about env)
    133   (let-from-environment env (path-out-real path-in user password)
     133  (let-from-environment env (path-out-real path-in user password path)
    134134    (let ((author (get-props-parents-first "svnblog:author" path-in path-out-real #f))
    135135          (index (get-weblog-index env))
    136136          (file (last (string-split path-out-real "/")))
    137           (path (svnwiki-make-pathname (butlast (string-split path-out-real "/")))))
     137          (path-weblog (svnwiki-make-pathname (butlast (string-split path-out-real "/")))))
    138138      (cond
     139        ((svnwiki-is-discuss? path-out-real)
     140         (let ((file-normal (last (string-split (svnwiki-discuss->normal path-out-real) "/"))))
     141           (html-stream
     142             (p "You are reading the discussion for the post "
     143                (b ((a href (format #f "../../~A" file-normal))
     144                    (get-post-title file-normal path-in (svnwiki-discuss->normal path-out-real))))
     145                (if author
     146                  (html-stream
     147                    ", which is part of "
     148                    ((a href "../..")
     149                     "the weblog of " (b author)))
     150                  (html-stream
     151                    ".  You can go to "
     152                    ((a href "../..")
     153                     "this weblog's main page")))
     154                "."))))
    139155        ((not (file-exists? (svnwiki-make-pathname path-in path-out-real)))
    140156         (html-stream
     
    150166                  ((a href "..")
    151167                   "this weblog's main page"))))))
    152         ((svnwiki-is-discuss? path-out-real)
    153          (html-stream
    154            (p "You are reading the discussion for the post "
    155               (b ((a href (format #f "../~A" file))
    156                   (get-post-title file path-in path-out-real)))
    157               (if author
    158                 (html-stream
    159                   ", which is part of "
    160                   ((a href "..")
    161                    "the weblog of " (b author)))
    162                 (html-stream
    163                   ".  You can go to "
    164                   ((a href "..")
    165                    "this weblog's main page")))
    166               ".")))
    167168        ((svnwiki-is-special? "xsvnwiki-archive" path-out-real)
    168169         (html-stream
     
    212213                        (b last-change)))
    213214                    ".")))))
    214            (let loop ((posts (stream-map car (list-all-posts (environment-capture env (path)))))
     215           (let loop ((posts (stream-map car (list-all-posts (environment-capture env (path-weblog)))))
    215216                      (next #f))
    216217             ; I used to think posts would not be null the first time (in which
     
    230231                                (stream-cadr posts)
    231232                                path-in
    232                                 (svnwiki-make-pathname path (stream-cadr posts)))))
     233                                (svnwiki-make-pathname path-weblog (stream-cadr posts)))))
    233234                          ".")))
    234235                   (if next
     
    239240                                next
    240241                                path-in
    241                                 (svnwiki-make-pathname path next))))
     242                                (svnwiki-make-pathname path-weblog next))))
    242243                          "."))
    243244                     stream-null))
    244245                 (loop (stream-cdr posts) (stream-car posts)))))))
    245246        (author
    246           (let ((posts-count (stream-length (list-all-posts (environment-capture env (path)))))
     247          (let ((posts-count (stream-length (list-all-posts (environment-capture env (path-weblog)))))
    247248                (number (get-posts-number env)))
    248249            (html-stream
Note: See TracChangeset for help on using the changeset viewer.