--- parser3/src/main/pa_request.C	2003/03/21 16:16:44	1.245.2.37.2.8
+++ parser3/src/main/pa_request.C	2003/04/03 11:32:09	1.245.2.37.2.26
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_REQUEST_C="$Date: 2003/03/21 16:16:44 $";
+static const char* IDENT_REQUEST_C="$Date: 2003/04/03 11:32:09 $";
 
 #include "pa_sapi.h"
 #include "pa_common.h"
@@ -30,6 +30,7 @@ static const char* IDENT_REQUEST_C="$Dat
 #include "pa_vform.h"
 #include "pa_vcookie.h"
 #include "pa_vresponse.h"
+#include "pa_vmemory.h"
 
 // consts
 
@@ -47,6 +48,10 @@ const char* ORIGINS_CONTENT_TYPE="text/p
 #define MAIN_METHOD_NAME "main"
 #define AUTO_METHOD_NAME "auto"
 #define BODY_NAME "body"
+#define EXCEPTION_TYPE_PART_NAME "type"
+#define EXCEPTION_SOURCE_PART_NAME "source"
+#define EXCEPTION_COMMENT_PART_NAME "comment"
+#define EXCEPTION_HANDLED_PART_NAME "handled"
 
 // globals
 
@@ -56,6 +61,10 @@ const String content_disposition_name(CO
 const String content_disposition_value(CONTENT_DISPOSITION_VALUE);
 const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME);
 const String body_name(BODY_NAME);
+const String exception_type_part_name(EXCEPTION_TYPE_PART_NAME);
+const String exception_source_part_name(EXCEPTION_SOURCE_PART_NAME);
+const String exception_comment_part_name(EXCEPTION_COMMENT_PART_NAME);
+const String exception_handled_part_name(EXCEPTION_HANDLED_PART_NAME);
 
 // defines for statics
 
@@ -81,9 +90,7 @@ static const String class_path_name(CLAS
 // defines
 
 // op.C
-VStateless_class* VClassMAIN_create();
-// op.C
-VHash& exception2vhash(const Exception& e);
+VStateless_class& VClassMAIN_create();
 
 //
 Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, 
@@ -110,7 +117,7 @@ Request::Request(SAPI_Info& asapi_info,
 	request_info(arequest_info),
 	charsets(UTF8_charset, UTF8_charset, UTF8_charset), // default charsets
 
-	main_class(*VClassMAIN_create()),
+	main_class(VClassMAIN_create()),
 	form(*new VForm),
 	mail(*new VMail),
 	response(*new VResponse(arequest_info, charsets)),
@@ -124,6 +131,10 @@ Request::Request(SAPI_Info& asapi_info,
 	// private mime types
 	mime_types(0)
 {
+	// file_no=0 => unknown
+	file_list+=StringBody("UNKNOWN");
+	file_list+=StringBody("-body of process-"); // pseudo_file_no__process
+
 	// maybe expire old caches
 	cache_managers.maybe_expire();
 	
@@ -136,14 +147,14 @@ Request::Request(SAPI_Info& asapi_info,
 
 	/// methodless
 	// env class
-	classes().put(*new StringBody(ENV_CLASS_NAME), new VEnv(asapi_info));
+	classes().put(StringBody(ENV_CLASS_NAME), new VEnv(asapi_info));
 	// status class
 	if(status_allowed)
-		classes().put(*new StringBody(STATUS_CLASS_NAME), new VStatus());
+		classes().put(StringBody(STATUS_CLASS_NAME), new VStatus());
 	// request class
-	classes().put(*new StringBody(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets));	
+	classes().put(StringBody(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets));	
 	// cookie class
-	classes().put(*new StringBody(COOKIE_CLASS_NAME), &cookie);
+	classes().put(StringBody(COOKIE_CLASS_NAME), &cookie);
 
 	/// methoded
 	// response class
@@ -159,6 +170,11 @@ Request::Request(SAPI_Info& asapi_info,
 		Value& math=*new VMath;
 		classes().put(math.get_class()->base_class()->name(), &math);
 	}
+	// memory class
+	{
+		Value& memory=*new VMemory;
+		classes().put(memory.get_class()->base_class()->name(), &memory);
+	}
 }
 
 Request::~Request() {
@@ -230,8 +246,10 @@ gettimeofday(&mt[0],NULL);
 		if(config_filespec) {
 			const String& filespec=*new String(config_filespec);
 			use_file(main_class,
-				filespec, true/* ignore class_path */, 
-				config_fail_on_read_problem, true/* file must exist if 'fail on read problem' not set */);
+				filespec, 0 /*main_alias*/, 
+				true /*ignore class_path*/, 
+				config_fail_on_read_problem, 
+				true /*file must exist if 'fail on read problem' not set*/);
 		}
 
 		// loading auto.p files from document_root/.. 
@@ -250,14 +268,17 @@ gettimeofday(&mt[0],NULL);
 			while(const char* before=strchr(after, '/')) {
 				String& sfile_spec=*new String;
 				if(after!=request_info.path_translated) {
-					sfile_spec.append(
+					sfile_spec.append_strdup(
 						request_info.path_translated, before-request_info.path_translated,
 						String::L_CLEAN);
 					sfile_spec << "/" AUTO_FILE_NAME;
 
 					use_file(main_class,
-						sfile_spec, true/* ignore class_path */, 
-						true/* fail on read problem */, false/* but ignore absence, sole user */);
+						sfile_spec, 
+						0 /*main_alias*/,
+						true /*ignore class_path*/, 
+						true /*fail on read problem*/, 
+						false /*but ignore absence, sole user*/);
 				}
 				after=before+1;
 			}
@@ -265,10 +286,11 @@ gettimeofday(&mt[0],NULL);
 
 		// compile requested file
 		String& spath_translated=*new String;
-		spath_translated.append(request_info.path_translated, 0, String::L_TAINTED);
+		spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED);
 		use_file(main_class,
-			spath_translated, true/* ignore class_path */, 
-			true/* fail on read problem*/, true/* fail on abscence */);
+			spath_translated, 
+			0 /*main_alias*/,
+			true /*ignore class_path*/);
 
 		// configure method_frame options if not configured yet
 		if(!configure_admin_done)
@@ -324,7 +346,7 @@ gettimeofday(&mt[2],NULL);
 				}
 
 		VFile* body_file=body_vstring_after_post_process->as_vfile(
-			String::L_UNSPECIFIED);
+			String::L_UNSPECIFIED, &charsets);
 
 		// extract response body
 		Value* body_value=response.fields().get(download_name);
@@ -333,7 +355,7 @@ gettimeofday(&mt[2],NULL);
 			body_value=response.fields().get(body_name);
 
 		if(body_value) // there is some $response:body
-			body_file=body_value->as_vfile();
+			body_file=body_value->as_vfile(String::L_UNSPECIFIED, &charsets);
 
 #ifdef RESOURCES_DEBUG
 //measure:after postprocess
@@ -363,21 +385,38 @@ t[9]-t[3]
 #endif
 	} catch(const Exception& e) { // request handling problem
 		// we're returning not result, but error explanation
-		try {
+//		try {
+#define PA_URI_FORMAT "%s: "
+#define PA_ORIGIN_FILE_POS_FORMAT "%s(%d:%d): "
+#define PA_SOURCE_FORMAT "'%s' "
+#define PA_COMMENT_TYPE_FORMAT "%s [%s]"
 			// log the beast
-			if(const String* problem_source=e.problem_source())
-				SAPI::log(sapi_info,
-					"%s: "
-					"'%s' %s [%s]",
-					request_info.uri,
-					problem_source->cstr(),
-					e.comment(),
-					e.type()
-				);
-			else
+			Request::Exception_details details=get_details(e);
+
+			if(details.problem_source) { // do we know the guy?
+				if(details.trace) { // do whe know where he came from?
+					Operation::Info origin=details.trace.origin();
+					SAPI::log(sapi_info,
+						PA_URI_FORMAT 
+						PA_ORIGIN_FILE_POS_FORMAT 
+						PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT,
+						request_info.uri,
+						file_list[origin.file_no], 1+origin.line, 1+origin.col,
+						details.problem_source->cstr(),
+						e.comment(), e.type()
+					);
+				} else
+					SAPI::log(sapi_info,
+						PA_URI_FORMAT 
+						PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT,
+						request_info.uri,
+						details.problem_source->cstr(),
+						e.comment(), e.type()
+					);
+			} else
 				SAPI::log(sapi_info,
-					"%s: "
-					"%s [%s]",
+					PA_URI_FORMAT 
+					PA_COMMENT_TYPE_FORMAT,
 					request_info.uri,
 					e.comment(), e.type()
 				);
@@ -399,41 +438,39 @@ t[9]-t[3]
 					false)) {
 				if(Junction* junction=value->get_junction()) {
 					if(const Method *method=junction->method) {
-		 				// preparing to pass parameters to 
-						//	@unhandled_exception[exception;stack]
-						VMethodFrame frame(/*method->name, */ *junction, 0/*no caller*/);
-						frame.set_self(main_class);
-
-						// $exception
-						frame.store_param(exception2vhash(e));
-						// $stack[^table::set{name	origin}]
-						Table::columns_type stack_trace_columns(new ArrayString);
-						*stack_trace_columns+=new String("name");
-						*stack_trace_columns+=new String("file");
-						*stack_trace_columns+=new String("lineno");
-						Table& stack_trace=*new Table(stack_trace_columns);
-						/*Array_iterator<String*> tracei(exception_trace);
-						while(tracei.has_next()) {
-							Table::element_type row(new ArrayString);
-
-							const String* name=tracei.next();
-							*row+=name; // name column
-#ifndef NO_STRING_ORIGIN
-							const String_fragment::Origin& origin=name->origin();
-							if(origin.file) {
-								*row+=*new StringBody(origin.file, 0, true)); // file column
-								*row+=*new StringBody(
-									pool().format_integer(1+origin.line), 
-									0, true)); // line column
-							}
-#endif
-							*stack_trace+=row;
-						}*/
-						frame.store_param(*new VTable(&stack_trace));
-
-						// future $response:body=
-						//   execute ^unhandled_exception[exception;stack]
-						body_string=&execute_method(frame, *method);
+// preparing to pass parameters to 
+//	@unhandled_exception[exception;stack]
+VMethodFrame frame(/*method->name, */ *junction, 0/*no caller*/);
+frame.set_self(main_class);
+
+// $exception
+frame.store_param(details.vhash);
+// $stack[^table::set{name	origin}]
+Table::columns_type stack_trace_columns(new ArrayString);
+*stack_trace_columns+=new String("name");
+*stack_trace_columns+=new String("file");
+*stack_trace_columns+=new String("lineno");
+*stack_trace_columns+=new String("colno");
+Table& stack_trace=*new Table(stack_trace_columns);
+if(!exception_trace.is_empty()/*signed!*/) 
+	for(size_t i=exception_trace.bottom_index(); i<=exception_trace.top_index(); i++) {
+		Trace trace=exception_trace.get(i);
+		Table::element_type row(new ArrayString);
+
+		*row+=trace.name(); // name column
+		Operation::Info origin=trace.origin();
+		if(origin.file_no) {
+			*row+=new String(file_list[origin.file_no], String::L_TAINTED); // 'file' column
+			*row+=new String(StringBody::Format(1+origin.line), String::L_CLEAN); // 'lineno' column
+			*row+=new String(StringBody::Format(1+origin.col), String::L_CLEAN); // 'colno' column
+		}
+		stack_trace+=row;
+	}
+frame.store_param(*new VTable(&stack_trace));
+
+// future $response:body=
+//   execute ^unhandled_exception[exception;stack]
+body_string=&execute_method(frame, *method);
 					}
 				}
 			}
@@ -442,13 +479,13 @@ t[9]-t[3]
 				// doing that ugly
 
 				// make up result: $origin $source $comment $type $code
-				char *buf=new char[MAX_STRING];
+				char *buf=new(PointerFreeGC) char[MAX_STRING];
 				size_t printed=0;
 				if(const String* problem_source=e.problem_source()) {
 					/*const String_fragment::Origin& origin=problem_source->origin();
 					if(origin.file)
 						printed+=snprintf(buf+printed, MAX_STRING-printed, 
-							ORIGIN_FILE_LINE_FORMAT": ", 
+							PA_ORIGIN_FILE_POS_FORMAT, 
 							origin.file, 1+origin.line
 						);
 					printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", 
@@ -468,19 +505,26 @@ t[9]-t[3]
 			}
 
 			VString body_vstring(*body_string);
-			VFile* body_file=body_vstring.as_vfile();
+			VFile* body_file=body_vstring.as_vfile(String::L_UNSPECIFIED, &charsets);
 
 			// ERROR. write it out
 			output_result(body_file, header_only, false);
-		} catch(const Exception& ) {
-			rethrow;
-		}
+//		} catch(const Exception& ) {
+//			rethrow;
+//		}
 	}
 }
 
+size_t Request::register_file(StringBody file_spec) {
+	file_list+=file_spec;
+	return file_list.count()-1;
+}
+
 void Request::use_file(VStateless_class& aclass,
-									const String& file_name, bool ignore_class_path, 
-									bool fail_on_read_problem, bool fail_on_file_absence) {
+		       const String& file_name, const String* main_alias, 
+		       bool ignore_class_path, 
+		       bool fail_on_read_problem, 
+		       bool fail_on_file_absence) {
 	// cyclic dependence check
 	if(used_files.get(file_name))
 		return;
@@ -489,7 +533,7 @@ void Request::use_file(VStateless_class&
 	const String* file_spec;
 	if(ignore_class_path) // ignore_class_path?
 		file_spec=&file_name;
-	else if(file_name.first_char()=='/') //absolute path, no need to scan MAIN:CLASS_PATH?
+	else if(file_name.first_char()=='/') //absolute path? [no need to scan MAIN:CLASS_PATH]
 		file_spec=&absolute(file_name);
 	else {
 		file_spec=0;
@@ -523,23 +567,24 @@ void Request::use_file(VStateless_class&
 			return;
 
 	if(const char* source=file_read_text(charsets.source(), *file_spec, fail_on_read_problem))
-		use_buf(aclass, source, *file_spec, file_spec->cstr());
+		use_buf(aclass, source, main_alias, register_file(*file_spec));
 }
 
 
 void Request::use_buf(VStateless_class& aclass,
-								   const char* source, 
-								   const String& filespec, const char* filespec_cstr) {
+		      const char* source, const String* main_alias, 
+		      uint file_no) {
 	// temporary zero @conf so to maybe-replace it in compiled code
 	Temp_method temp_method_conf(aclass, conf_method_name, 0);
 	// temporary zero @auto so to maybe-replace it in compiled code
 	Temp_method temp_method_auto(aclass, auto_method_name, 0);
 
 	// compile loaded class
-	VStateless_class& cclass=compile(&aclass, source, filespec_cstr);
+	VStateless_class& cclass=compile(&aclass, source, main_alias, file_no);
 
 	// locate and execute possible @conf[] static
-	VString* vfilespec=new VString(filespec);
+	VString* vfilespec=
+		new VString(*new String(file_list[file_no], String::L_TAINTED));
 	Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, 
 		conf_method_name, vfilespec,
 		false/*no string result needed*/);
@@ -567,7 +612,8 @@ const String& Request::absolute(const St
 		result << relative_name;
 		return result;
 	} else 
-		return relative_name.pos("://")<0? relative(request_info.path_translated, relative_name)
+		return relative_name.pos("://")==STRING_NOT_FOUND?
+			relative(request_info.path_translated, relative_name)
 			:relative_name; // something like "http://xxx"
 }
 
@@ -582,7 +628,7 @@ static void add_header_attribute(
 
 	SAPI::add_header_attribute(r->sapi_info,
 		aattribute.cstr(), 
-		attributed_meaning_to_string(ameaning, String::L_HTTP_HEADER, false).
+		attributed_meaning_to_string(*ameaning, String::L_HTTP_HEADER, false).
 			cstr(String::L_UNSPECIFIED));
 }
 void Request::output_result(VFile* body_file, bool header_only, bool as_attachment) {
@@ -660,32 +706,77 @@ const String& Request::mime_type_of(cons
 }
 
 #ifdef XML
-
 GdomeDOMString_auto_ptr Request::transcode(const String& s) {
 	return charsets.source().transcode(s);
 }
 
-const String& Request::transcode(GdomeDOMString* s
-#ifndef NO_STRING_ORIGIN
-	, const String& origin
-#endif
-	) {
-	return charsets.source().transcode(s
-#ifndef NO_STRING_ORIGIN
-		, origin
-#endif
-		);
+GdomeDOMString_auto_ptr Request::transcode(const StringBody s) {
+	return charsets.source().transcode(s);
 }
 
-const String& Request::transcode(xmlChar* s
-#ifndef NO_STRING_ORIGIN
-	, const String& origin
-#endif
-	) {
-	return charsets.source().transcode(s
-#ifndef NO_STRING_ORIGIN
-		, origin
-#endif
-		);
+const String& Request::transcode(GdomeDOMString* s) {
+	return charsets.source().transcode(s);
+}
+
+const String& Request::transcode(xmlChar* s) {
+	return charsets.source().transcode(s);
 }
 #endif
+
+
+const Request::Trace Request::Exception_trace::extract_origin(const String*& problem_source) {
+	Trace result;
+	if(!is_empty()) {
+		result=bottom_value();
+		if(!problem_source) { // we don't know who trigged the bug?
+			problem_source=result.name(); // consider the stack-top-guy did that
+			fbottom++;
+		} else if(result.name()==problem_source) // it is that same guy?
+			fbottom++; // throw away that trace
+		// else stack top contains not us, 
+		//	leaving result intact
+		//	it would help ^throw
+	}
+
+	return result;
+}
+
+Request::Exception_details Request::get_details(const Exception& e) {
+	const String* problem_source=e.problem_source();
+	Trace trace=exception_trace.extract_origin(problem_source);
+	
+	VHash& vhash=*new VHash;  HashStringValue& hash=vhash.hash();
+
+	// $.type
+	if(const char* type=e.type(true))
+		hash.put(exception_type_part_name, new VString(*new String(type)));
+
+	// $.source
+	if(problem_source) {
+		String& source=*new String; 
+		source.append(*problem_source, String::L_TAINTED, true/*forced*/);
+
+		hash.put(exception_source_part_name, new VString(source));
+	}
+
+	// $.file lineno colno
+	if(trace) {
+		const Operation::Info origin=trace.origin();
+		hash.put(StringBody("file"),
+			new VString(*new String(file_list[origin.file_no], String::L_TAINTED)));
+		hash.put(StringBody("lineno"), new VInt(1+origin.line));
+		hash.put(StringBody("colno"), new VInt(1+origin.col));
+	}
+
+	// $.comment
+	if(const char* comment=e.comment(true))
+		hash.put(exception_comment_part_name, 
+			new VString(*new String(comment, 0, true/*tainted*/)));
+
+	// $.handled(0)
+	hash.put(exception_handled_part_name, new VBool(false));
+
+	return Request::Exception_details(trace, problem_source, vhash);
+}
+
+//
\ No newline at end of file