original commit: e515cf70d85b98e74c4efa22b9e1547fee5cd05a
This commit is contained in:
Robby Findler 2004-02-04 18:00:18 +00:00
parent e0dd79a1cd
commit af279647b2

View File

@ -322,19 +322,24 @@
[(text) (load-txt-keywords doc)] [(text) (load-txt-keywords doc)]
[else null])] [else null])]
[add-key-choice (lambda (v) [add-key-choice (lambda (v)
(found "keyword entries") (when (and (pair? v)
(add-choice (pair? (cdr v))
(car v) ; key (pair? (cddr v))
(cadr v) ; display (pair? (cdddr v))
(list-ref v 4) ; title (pair? (cddddr v)))
(if (eq? 'text doc-kind) (found "keyword entries")
(apply build-path doc) (add-choice
(let ([file (list-ref v 2)]) (car v) ; key
(if (servlet-path? file) (cadr v) ; display
file (list-ref v 4) ; title
(build-path doc file)))) (if (eq? 'text doc-kind)
(list-ref v 3) ; label (apply build-path doc)
ckey))]) (let ([file (list-ref v 2)])
(if (servlet-path? file)
file
(build-path doc file))))
(list-ref v 3) ; label
ckey)))])
(unless regexp? (unless regexp?
(for-each (for-each
(lambda (v) (lambda (v)
@ -358,16 +363,19 @@
[add-index-choice (lambda (name desc) [add-index-choice (lambda (name desc)
(case doc-kind (case doc-kind
[(html) [(html)
(found "index entries") (when (and (pair? desc)
(add-choice (pair? (cdr desc))
"" name (pair? (cddr desc)))
(list-ref desc 2) (found "index entries")
(let ([filename (list-ref desc 0)]) (add-choice
(if (servlet-path? filename) "" name
filename (list-ref desc 2)
(combine-path/url-path doc filename))) (let ([filename (list-ref desc 0)])
(list-ref desc 1) (if (servlet-path? filename)
ckey)] filename
(combine-path/url-path doc filename)))
(list-ref desc 1)
ckey))]
[(text) [(text)
(found "index entries") (found "index entries")
(add-choice (add-choice