Changeset 32671 in project


Ignore:
Timestamp:
08/08/15 17:43:28 (4 years ago)
Author:
sjamaan
Message:

qwiki: Make qwiki-search optional again by registering it with the qwiki-install module. Unfortunately this does mean qwiki-install is loaded even during regular operation. It's small, so who cares?

Location:
release/4/qwiki/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/4/qwiki/trunk/qwiki-install.scm

    r31178 r32671  
    3535
    3636(module qwiki-install
    37   (qwiki-install!)
     37  (qwiki-install! qwiki-pre-install-handlers)
    3838
    3939(import chicken scheme)
     
    5353   (directory (string-join (cons (qwiki-source-path) base-path) "/"))))
    5454
     55(define qwiki-pre-install-handlers
     56  (make-parameter (list)))
     57
    5558(define (qwiki-install!)
    5659  (checkout-sources! (qwiki-source-path))
    57   ;; TODO: search is supposed to be purely optional!
    58   (create-search-node!)
     60  (for-each (lambda (thunk) (thunk)) (qwiki-pre-install-handlers))
    5961  (traverse-file-tree '()))
    6062
  • release/4/qwiki/trunk/qwiki-search.scm

    r32670 r32671  
    4040(import chicken scheme)
    4141(use data-structures extras srfi-1 srfi-13 intarweb uri-common spiffy
    42      qwiki qwiki-sxml sxml-transforms sxpath sxpath-lolevel estraier-client irregex)
     42     qwiki qwiki-sxml sxml-transforms sxpath sxpath-lolevel
     43     estraier-client irregex qwiki-install)
    4344
    4445(define search-server-uri
     
    214215
    215216(define (search-install!)
     217  (qwiki-pre-install-handlers
     218   (cons create-search-node! (qwiki-pre-install-handlers)))
    216219  (qwiki-global-action-handlers (cons `(search . ,search)
    217220                                      (qwiki-global-action-handlers)))
Note: See TracChangeset for help on using the changeset viewer.