Ticket #197: qwiki-titles.diff

qwiki.scm

@@ -58 +58 @@
 
 (import chicken scheme)
 (use extras files posix ports data-structures srfi-1 srfi-13 srfi-14
-     intarweb uri-common spiffy sxml-transforms
+     intarweb uri-common spiffy sxml-transforms sxpath
      wiki-parse qwiki-sxml doctype
      ;; There should be a way to parameterize the versioning implementation
      qwiki-svn)
@@ -297 +297 @@
     (if (file-exists? source-file)
         (if rev
             (send-content ; Do not store if old rev
-             (qwiki-sxml-page-template
-              (call-with-input-revision
-               source-file rev wiki-parse)))
+             (let* ((sxml (call-with-input-revision source-file rev wiki-parse))
+                    (title ((sxpath '(// (Section 1) *text*)) (cons 'root sxml))))
+               (qwiki-sxml-page-template
+                sxml `((title . ,(sprintf "~A (historical revision ~A)"
+                                          (if (null? title)
+                                              path
+                                              (car title))
+                                          rev))))))
             (begin
               (when (or (not (file-exists? html-path))
                         (file-newer? source-file html-path))
@@ -312 +317 @@
 
 ;; Generate new cached HTML file
 (define (regenerate-html-file! path page)
-  (let ((html-file (make-pathname (qwiki-web-path) (path->html-filename path))))
+  (let* ((html-file (make-pathname (qwiki-web-path) (path->html-filename path)))
+         (title ((sxpath '(// (Section 1) *text*)) (cons 'root page))))
     (with-output-to-path html-file
       (lambda ()
-        (let ((content (qwiki-sxml-page-template page)))
+        (let ((content (qwiki-sxml-page-template
+                        page `((title . ,(if (null? title)
+                                             path
+                                             (car title)))))))
           (output-xml content (qwiki-transformation-steps content)))))))
 
 (define (qwiki-update-file! path)

qwiki.meta

@@ -1 +1 @@
 ((synopsis "qwiki - the quick wiki")
  (depends matchable wiki-parse intarweb uri-common spiffy (doctype "1.2") 
-          (sxml-transforms "1.4") multidoc (svn-client "0.11") estraier-client)
+          (sxml-transforms "1.4") multidoc (svn-client "0.11") estraier-client
+          sxpath)
  (author "Peter Bex")
  (category www)
  (license "BSD")