* moved files concerning web server to new subdirectory httpd

* minor change in inner order of modules.scm
* commented out structure in program-modules: source files are missing (?)

modules.scm

@@ -85,6 +85,45 @@
         scheme)
   (files ecm-utilities))
 
+
+;;; parse-html-forms
+;;; For parsing submissions from HTML forms.
+
+(define-interface parse-html-forms-interface
+  (export parse-html-form-query unescape-uri+))
+
+(define-structure parse-html-forms parse-html-forms-interface
+  (open scsh 
+	scsh-utilities 
+	let-opt 
+	string-lib
+	receiving 
+	uri
+	scheme)
+  (files parse-forms))
+
+
+;;; htmlout
+
+(define-interface htmlout-interface
+  (export emit-tag
+	  emit-close-tag
+
+	  emit-p
+	  emit-title	
+	  emit-header	; And so forth...
+
+	  with-tag
+	  with-tag*
+
+	  escape-html
+	  emit-text))
+
+(define-structure htmlout htmlout-interface
+  (open scsh scsh-utilities string-lib formats ascii receiving scheme)
+  (files htmlout))
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Clients / RFC
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -555,7 +594,7 @@
 	string-lib     ; STRING-JOIN
 	i/o            ; make-null-output-port
 	scheme)
-  (files httpd-core))
+  (files (httpd httpd-core)))
 
 
 ;;; httpd-make-options
@@ -587,7 +626,7 @@
 		    (httpd-read-options httpd-read-options-interface))
   (open scheme
 	define-record-types)
-  (files httpd-options))
+  (files (httpd httpd-options)))
 
 
 ;;; httpd-access-control
@@ -605,7 +644,7 @@
 	string-lib    ; STRING-MAP
 	scsh
 	scheme)
-  (files httpd-access-control))
+  (files (httpd httpd-access-control)))
 
 
 ;;; httpd-error
@@ -618,7 +657,7 @@
 
 (define-structure httpd-error httpd-error-interface
   (open conditions signals handle scheme)
-  (files httpd-error))
+  (files (httpd httpd-error)))
 
 ;;; httpd-fatal-error
 
@@ -628,45 +667,7 @@
 
 (define-structure handle-fatal-error handle-fatal-error-interface
   (open scheme conditions handle)
-  (files handle-fatal-error))
-
-
-;;; parse-html-forms
-;;; For parsing submissions from HTML forms.
-
-(define-interface parse-html-forms-interface
-  (export parse-html-form-query unescape-uri+))
-
-(define-structure parse-html-forms parse-html-forms-interface
-  (open scsh 
-	scsh-utilities 
-	let-opt 
-	string-lib
-	receiving 
-	uri
-	scheme)
-  (files parse-forms))
-
-
-;;; htmlout
-
-(define-interface htmlout-interface
-  (export emit-tag
-	  emit-close-tag
-
-	  emit-p
-	  emit-title	
-	  emit-header	; And so forth...
-
-	  with-tag
-	  with-tag*
-
-	  escape-html
-	  emit-text))
-
-(define-structure htmlout htmlout-interface
-  (open scsh scsh-utilities string-lib formats ascii receiving scheme)
-  (files htmlout))
+  (files (httpd handle-fatal-error)))
 
 
 ;; path-handlers
@@ -701,7 +702,7 @@
 	handle-fatal-error  ; WITH-FATAL-ERROR-HANDLER
 	string-lib      ; STRING-JOIN
 	scheme)
-  (files httpd-handlers))
+  (files (httpd httpd-handlers)))
 
 
 ;;; seval-handler
@@ -725,7 +726,7 @@
 	parse-html-forms ; PARSE-HTML-FORM-QUERY
 	threads         ; SLEEP
 	scheme)
-  (files seval))
+  (files (httpd seval)))
 
 
 
@@ -748,7 +749,7 @@
 	scsh
 	handle-fatal-error
 	scheme)
-  (files info-gateway))
+  (files (httpd info-gateway)))
 
 
 ;;; rman-gateway
@@ -776,7 +777,7 @@
 	let-opt
 	string-lib
 	scheme)
-  (files rman-gateway))
+  (files (httpd rman-gateway)))
 
 
 ;;; CGI Server
@@ -803,7 +804,7 @@
 	sunet-utilities         ; host-name-or-empty
 	let-opt                 ; let-optionals
 	scheme)
-  (files cgi-server))
+  (files (httpd cgi-server)))
 
 
 ;;; FTP server: ftpd

program-modules.scm

@@ -18,27 +18,31 @@
 	condhax			; ? is COND
 	switch-syntax		; SWITCHQ
 	scheme)
-  (files scheme-program-server))
+  (files (httpd scheme-program-server)))
 
 ;;; package to load scheme programs
 
-(define-structure scheme-programs-package (export testprog
-						  info2www)
-  (open scsh		; syscalls & INDEX
-	condhax		; WHEN, ? for COND
-	switch-syntax	; Conditionals
-	defrec-package  ; Records
-	htmlout-package	; Formatted HTML output
-	httpd-core      ; REQUEST record type, HTTP-ERROR & reply codes
-			; version stuff
-	uri-package	; UNESCAPE-URI
-	error-package	; ERROR
-	pp		; Pretty-printer
-	strings rfc822
-	toothless-eval	; EVAL-SAFELY
-	handle		; IGNORE-ERROR
-	strings		; SKIP-WHITESPACE
-	parse-html-forms ; PARSE-HTML-FORM-QUERY
-	scheme)
-  (files testprog
-	 info2www))
+;;
+;; source files are missing!?
+;;
+
+;;; cheme-programs-package (export testprog
+;;;      			  info2www)
+;;;      ; syscalls & INDEX
+;;;      ; WHEN, ? for COND
+;;; ax	; Conditionals
+;;; age  ; Records
+;;; kage	; Formatted HTML output
+;;;      ; REQUEST record type, HTTP-ERROR & reply codes
+;;;      ; version stuff
+;;; 	; UNESCAPE-URI
+;;; ge	; ERROR
+;;;      ; Pretty-printer
+;;; 822
+;;; val	; EVAL-SAFELY
+;;;      ; IGNORE-ERROR
+;;;      ; SKIP-WHITESPACE
+;;; forms ; PARSE-HTML-FORM-QUERY
+;;; 
+;;; 
+;;;