From 541113a4f0995b6d06b44fafca15dc747af35098 Mon Sep 17 00:00:00 2001 From: sperber Date: Mon, 26 Aug 2002 11:21:53 +0000 Subject: [PATCH] Fold text-generation.scm (which was down to a few lines) into core.scm. --- scheme/httpd/core.scm | 6 +++++ scheme/httpd/text-generation.scm | 11 --------- scheme/packages.scm | 41 ++++++++++---------------------- 3 files changed, 18 insertions(+), 40 deletions(-) delete mode 100644 scheme/httpd/text-generation.scm diff --git a/scheme/httpd/core.scm b/scheme/httpd/core.scm index 718826b..fdae955 100644 --- a/scheme/httpd/core.scm +++ b/scheme/httpd/core.scm @@ -296,6 +296,9 @@ (write-crlf port)) headers)) +(define (time->http-date-string time) + (format-date "~A, ~d-~b-~y ~H:~M:~S GMT" (date time 0))) + ;;; (make-http-error-response status-code req [message . extras]) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Take an http-error condition, and format it into a response to the client. @@ -430,6 +433,9 @@ the requested method (~A).~%" (generic-title port) (close-html port))))))) +(define (title-html out message) + (format out "~%~%~A~%~%~%~%" message) + (format out "~%

~A

~%" message)) ;;; Return my Internet host name (my fully-qualified domain name). ;;; This works only if an actual resolver is behind host-info. diff --git a/scheme/httpd/text-generation.scm b/scheme/httpd/text-generation.scm deleted file mode 100644 index ed21c04..0000000 --- a/scheme/httpd/text-generation.scm +++ /dev/null @@ -1,11 +0,0 @@ -;;; Text generation utilities. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define (time->http-date-string time) - (format-date "~A, ~d-~b-~y ~H:~M:~S GMT" (date time 0))) - -(define (title-html out message) - (format out "~%~%~A~%~%~%~%" message) - (format out "~%

~A

~%" message)) - - diff --git a/scheme/packages.scm b/scheme/packages.scm index 5d1db8e..fedcfac 100644 --- a/scheme/packages.scm +++ b/scheme/packages.scm @@ -249,7 +249,8 @@ (define-interface httpd-core-interface (export httpd - make-http-error-response)) + make-http-error-response + time->http-date-string)) (define-interface httpd-make-options-interface (export with-port @@ -319,10 +320,6 @@ (export server/version server/protocol)) -(define-interface httpd-text-generation-interface - (export time->http-date-string - title-html)) - (define-interface httpd-responses-interface (export make-response response? response-code @@ -665,7 +662,6 @@ httpd-request httpd-constants httpd-responses - httpd-text-generation scheme) (files (httpd core))) @@ -718,15 +714,6 @@ (open scheme) (files (httpd constants))) -(define-structure httpd-text-generation httpd-text-generation-interface - (open formats - httpd-responses ; status-code->text - crlf-io - httpd-constants - scheme - scsh) ; format-date - (files (httpd text-generation))) - (define-structure httpd-responses httpd-responses-interface (open scheme srfi-9 @@ -746,7 +733,6 @@ httpd-core httpd-request httpd-responses - httpd-text-generation httpd-error httpd-read-options url @@ -759,22 +745,21 @@ (files (httpd file-dir-handler))) (define-structure seval-handler seval-handler-interface - (open scsh ; syscalls & INDEX + (open scsh ; syscalls & INDEX httpd-error httpd-request ; v0.9-request - httpd-text-generation ; begin-http-header httpd-responses httpd-logging ; http-log - uri ; UNESCAPE-URI - htmlout ; Formatted HTML output - error-package ; ERROR - pp ; Pretty-printer - string-lib ; STRING-SKIP + uri ; UNESCAPE-URI + htmlout ; Formatted HTML output + error-package ; ERROR + pp ; Pretty-printer + string-lib ; STRING-SKIP rfc822 - toothless-eval ; EVAL-SAFELY - handle ; IGNORE-ERROR - parse-html-forms ; PARSE-HTML-FORM-QUERY - threads ; SLEEP + toothless-eval ; EVAL-SAFELY + handle ; IGNORE-ERROR + parse-html-forms ; PARSE-HTML-FORM-QUERY + threads ; SLEEP scheme) (files (httpd seval))) @@ -784,7 +769,6 @@ conditions signals handle htmlout httpd-request - httpd-text-generation httpd-responses httpd-error url @@ -797,7 +781,6 @@ (define-structure rman-gateway rman-gateway-interface (open httpd-responses httpd-request - httpd-text-generation httpd-error conditions url