--- parser3/src/targets/cgi/parser3.C	2001/03/18 11:37:53	1.16
+++ parser3/src/targets/cgi/parser3.C	2001/03/18 16:32:26	1.20
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: parser3.C,v 1.16 2001/03/18 11:37:53 paf Exp $
+	$Id: parser3.C,v 1.20 2001/03/18 16:32:26 paf Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -25,6 +25,7 @@
 #include "pa_common.h"
 
 Pool pool; // global pool
+bool cgi;
 
 #ifdef WIN32
 #	if _MSC_VER
@@ -55,6 +56,8 @@ LONG WINAPI TopLevelExceptionFilter (
 #	endif
 #endif
 
+// service funcs
+
 int read_post(char *buf, int max_bytes) {
 	int read_size=0;
 	do {
@@ -68,6 +71,20 @@ int read_post(char *buf, int max_bytes)
 	return read_size;
 }
 
+void output_header_attribute(const char *key, const char *value) {
+	if(cgi)
+		printf("%s: %s\n", key, value);
+}
+
+void output_body(const char *buf, size_t size) {
+	if(cgi) // header | body  delimiter
+		puts("");
+
+	stdout_write(buf, size);
+}
+
+// main
+
 int main(int argc, char *argv[]) {
 	//TODO: umask(2);
 #ifdef WIN32
@@ -78,9 +95,11 @@ int main(int argc, char *argv[]) {
 
 	// Service funcs 
 	service_funcs.read_post=read_post;
+	service_funcs.output_header_attribute=output_header_attribute;
+	service_funcs.output_body=output_body;
 	
 	// were we started as CGI?
-	bool cgi=
+	cgi=
 		getenv("SERVER_SOFTWARE") || 
 		getenv("SERVER_NAME") || 
 		getenv("GATEWAY_INTERFACE") || 
@@ -160,31 +179,9 @@ int main(int argc, char *argv[]) {
 		request.core(pool.exception(),
 			sys_auto_path1, 
 			sys_auto_path2);
-
-		// extract request.response body
-		Value *body_value=static_cast<Value *>(
-			request.response.fields().get(*body_name));
-		const char *body=body_value?
-			body_value->as_string().cstr():"no body";// TODO: IMAGE&FILE
-
-		// OK. write out the result
-		if(cgi) {
-			// content-type:
-			Value *content_type_value=static_cast<Value *>(
-				request.response.fields().get(*content_type_name));
-			const char *content_type=content_type_value?
-				content_type_value->as_string().cstr():"text/html";
-
-			// header
-			printf(
-				"Content-type: %s\n"
-				"Content-length: %d\n"
-				"\n", 
-				content_type,
-				strlen(body));
-		}
-		// body
-		stdout_write(body);
+		// no actions with request' data past this point
+		// request.exception not not handled here, but all
+		// request' data are associated with it's pool=exception
 
 			// must be last in PTRY{}PCATCH
 #ifdef WIN32
@@ -200,17 +197,18 @@ int main(int argc, char *argv[]) {
 		// @prepare to .core()
 		// @request.core when reporting request exception
 		// @write result
-		const char *error=e.comment();
+		const char *body=e.comment();
+		int content_length=strlen(body);
+
+		// header
+		(*service_funcs.output_header_attribute)("content-type", "text/plain");
+		char content_length_cstr[MAX_NUMBER];
+		snprintf(content_length_cstr, MAX_NUMBER, "%d", content_length);
+		(*service_funcs.output_header_attribute)("content-length", 
+			content_length_cstr);
 
-		if(cgi) {
-			printf(
-				"Content-type: text/plain\n"
-				"Content-length: %d\n"
-				"\n", 
-				strlen(error));
-			stdout_write(error);
-		} else
-			fputs(error, stderr);
+		// body
+		(*service_funcs.output_body)(body, content_length);
 
 		// unsuccessful finish
 		return 1;