From dfe0ef11f75e618ef0c02f33a2c2fca3aca66769 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sat, 26 Nov 2005 15:48:26 +0000 Subject: [PATCH] partial fix to PR 7705 svn: r1413 --- collects/help/private/gui.ss | 16 +++++++++------- collects/help/private/standard-urls.ss | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/collects/help/private/gui.ss b/collects/help/private/gui.ss index 0cfa0db013..f8f78bb476 100644 --- a/collects/help/private/gui.ss +++ b/collects/help/private/gui.ss @@ -119,14 +119,16 @@ (let* ([path (url-path url)] [coll (and (pair? path) (pair? (cdr path)) - (cadr path))]) + (cadr path))] + [coll-path (and coll (string->path coll))] + [doc-pr (and coll-path (assoc coll-path known-docs))]) + ;; check to see if the docs are installed - (if (and coll - (assoc coll known-docs) - (not (has-index-installed? (string->path coll)))) - (let ([doc-pr (assoc coll known-docs)] - [url-str (url->string url)]) - (make-missing-manual-url coll (cdr doc-pr) url-str)) + (if (and doc-pr + (not (has-index-installed? coll-path))) + (let ([url-str (url->string url)]) + (string->url + (make-missing-manual-url coll (cdr doc-pr) url-str))) url))] [(and (equal? addon-host (url-host url)) diff --git a/collects/help/private/standard-urls.ss b/collects/help/private/standard-urls.ss index 9220a0e0a6..6cd585a12b 100644 --- a/collects/help/private/standard-urls.ss +++ b/collects/help/private/standard-urls.ss @@ -30,7 +30,7 @@ string?)) (flush-manuals-url string?) (flush-manuals-path string?) - (make-missing-manual-url (string? string? string? string? . -> . string?)) + (make-missing-manual-url (string? string? string? . -> . string?)) (get-hd-location ((lambda (sym) (memq sym hd-location-syms)) . -> . string)) @@ -60,7 +60,7 @@ (define home-page-url (format "http://~a:~a/servlets/home.ss" internal-host internal-port)) - (define (make-missing-manual-url cookie coll name link) + (define (make-missing-manual-url coll name link) (format "http://~a:~a/servlets/missing-manual.ss?manual=~a&name=~a&link=~a" internal-host internal-port