suzanne.soy/scribble-enhanced
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

help desk now reports bad hdindex and keywords files when searching

Browse Source 
svn: r1291

original commit: 09aba062b7f49bbfc9b46f06fc0ea0e91318f164
This commit is contained in:
Robby Findler 2005-11-12 03:36:35 +00:00
parent b7a42527dd
commit 0b0ab3ecc8
1 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
collects/help/private/search.ss
View File

@ -116,11 +116,8 @@
html-keywords html-keywords
doc doc
(lambda () (lambda ()
(with-handlers ([exn:fail:read? (λ (x) null)] (transform-keywords
[exn:fail:filesystem? (λ (x) null)]) (build-path doc "keywords")))))
(transform-keywords
(with-input-from-file (build-path doc "keywords")
read))))))
(define html-indices (make-hash-table 'equal)) (define html-indices (make-hash-table 'equal))
(define (load-html-index doc) (define (load-html-index doc)
@ -128,53 +125,65 @@
html-indices html-indices
doc doc
(lambda () (lambda ()
(with-handlers ([exn:fail:read? (lambda (x) null)] (transform-hdindex
[exn:fail:filesystem? (lambda (x) null)]) (build-path doc "hdindex")))))
(transform-hdindex
(with-input-from-file (build-path doc "hdindex")
read))))))
;; transform-hdindex : any -> (listof (list string path string string) ;; transform-hdindex : any -> (listof (list string path string string)
;; makes sure the input from the file is well-formed and changes ;; makes sure the input from the file is well-formed and changes
;; the bytes to paths. ;; the bytes to paths.
(define (transform-hdindex l) (define (transform-hdindex filename)
(let/ec k (verify-file filename
(let ([fail (lambda () (k '()))]) (λ (l)
(unless (list? l) (fail)) (match l
(map (lambda (l) [`(,(? string? index)
(match l ,(? string? file)
[`(,(? string? index) ,(? string? label)
,(? string? file) ,(? string? title))
,(? string? label) #t]
,(? string? title)) [else
(list index #f]))))
file
label
title)]
[else
(fail)]))
l))))
;; transform-keywords : any -> (listof (list string string path string string) ;; transform-keywords : any -> (listof (list string string path string string)
;; as with transform-hdindex ;; as with transform-hdindex
(define (transform-keywords l) (define (transform-keywords filename)
(verify-file filename
(λ (l)
(match l
[`(,(? string? keyword)
,(? string? result)
,(? path-string? file)
,(? string? label)
,(? string? title))
#t]
[else
#f]))))
(define (verify-file filename ele-ok?)
(let/ec k (let/ec k
(let ([fail (lambda () (k '()))]) (let ([fail (lambda (why)
(unless (list? l) (fail)) (fprintf (current-error-port)
(map (lambda (l) "loading docs from ~a failed: ~a\n"
(match l (path->string filename)
[`(,(? string? keyword) why)
,(? string? result) (k '()))])
,(? path-string? file) (with-handlers ([exn:fail:read? (lambda (x)
,(? string? label) (fail
,(? string? title)) (format "read error when opening the file ~a"
(list keyword (exn-message x))))]
result [exn:fail:filesystem?
file (lambda (x)
label (fail (format
title)] "filesystem error when opening the file ~a"
[else (fail)])) (exn-message x))))])
l)))) (let ([l (if (file-exists? filename)
(call-with-input-file filename read)
'())])
(unless (list? l) (fail "not a list"))
(for-each (lambda (l)
(unless (ele-ok? l)
(fail (format "line ~s is malformed" l))))
l)
l)))))
(define (parse-txt-file doc ht handle-one) (define (parse-txt-file doc ht handle-one)
(with-hash-table (with-hash-table
@ -351,7 +360,6 @@
(unless (< hit-count MAX-HIT-COUNT) (unless (< hit-count MAX-HIT-COUNT)
(maxxed-out))) (maxxed-out)))
; Keyword search ; Keyword search
(let ([keys (case doc-kind (let ([keys (case doc-kind
[(html) (load-html-keywords doc)] [(html) (load-html-keywords doc)]
@ -378,7 +386,7 @@
(build-path doc file)))) (build-path doc file))))
(list-ref v 3) ; label (list-ref v 3) ; label
ckey)))]) ckey)))])
(unless regexp? (unless regexp?
(for-each (for-each
(lambda (v) (lambda (v)