From 7c5973cb943d4022123f59ed49683eb45ba11550 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Tue, 25 May 2010 15:42:20 -0600 Subject: [PATCH] Fixing graph display --- collects/meta/drdr/render.ss | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/collects/meta/drdr/render.ss b/collects/meta/drdr/render.ss index 3a9533516e..ba8aa97253 100644 --- a/collects/meta/drdr/render.ss +++ b/collects/meta/drdr/render.ss @@ -203,7 +203,7 @@ path))]) changes)))))] [else - 'nbsp])) + '" "])) (define (footer) `(div ([id "footer"]) @@ -264,7 +264,7 @@ (tr (td "Duration:") (td ,(format-duration-ms dur))) (tr (td "Timeout:") (td ,(if (timeout? log) checkmark-entity ""))) (tr (td "Exit Code:") (td ,(if (exit? log) (number->string (exit-code log)) ""))) - (tr (td nbsp) (td (a ([href ,scm-url]) "View File")))) + (tr (td " ") (td (a ([href ,scm-url]) "View File")))) ,(if (lc-zero? changed) "" `(div ([class "error"]) @@ -287,14 +287,18 @@ (img ([src ,png-path])))))]) (make-cdata #f #f - (file->string - (path-timing-html (substring (path->string* the-base-path) 1))))) + (local [(define content + (file->string + (path-timing-html (substring (path->string* the-base-path) 1))))] + #;(regexp-replace* #rx"&(?![a-z]+;)" content "\\&\\1") + (regexp-replace* #rx">" content ">")) + )) ,(footer))))])])) (define (number->string/zero v) (cond [(zero? v) - 'nbsp] + '" "] [else (number->string v)])) @@ -421,7 +425,7 @@ ,(if directory? (number->string/zero v) (if (zero? v) - 'nbsp + '" " checkmark-entity)))) (list timeout unclean stderr changes)) (td ,responsible-party))]) @@ -444,7 +448,7 @@ (td ,(number->string/zero (lc->number tot-unclean))) (td ,(number->string/zero (lc->number tot-stderr))) (td ,(number->string/zero (lc->number tot-changes))) - (td nbsp)))) + (td " ")))) ,(footer))))])) (define (show-help req) @@ -837,6 +841,15 @@ [((integer-arg) "") show-revision] [((integer-arg) (string-arg) ...) show-file])) +#;(define (xml-dispatch req) + (define xe (top-dispatch req)) + (define full + (make-xexpr-response xe #:mime-type #"application/xhtml+xml")) + (struct-copy response/full full + [body (list* + #"\n" + (response/full-body full))])) + (date-display-format 'iso-8601) (cache/file-mode 'no-cache) (serve/servlet top-dispatch