--- parser3/src/main/pa_request.C	2003/04/03 10:18:24	1.245.2.37.2.24
+++ parser3/src/main/pa_request.C	2003/04/08 12:47:31	1.245.2.37.2.29
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_REQUEST_C="$Date: 2003/04/03 10:18:24 $";
+static const char* IDENT_REQUEST_C="$Date: 2003/04/08 12:47:31 $";
 
 #include "pa_sapi.h"
 #include "pa_common.h"
@@ -246,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/.. 
@@ -272,8 +274,11 @@ gettimeofday(&mt[0],NULL);
 					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;
 			}
@@ -283,8 +288,9 @@ gettimeofday(&mt[0],NULL);
 		String& spath_translated=*new String;
 		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)
@@ -389,13 +395,13 @@ t[9]-t[3]
 
 			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();
+					Operation::Origin 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,
+						file_list[origin.file_no].cstr(), 1+origin.line, 1+origin.col,
 						details.problem_source->cstr(),
 						e.comment(), e.type()
 					);
@@ -452,7 +458,7 @@ if(!exception_trace.is_empty()/*signed!*
 		Table::element_type row(new ArrayString);
 
 		*row+=trace.name(); // name column
-		Operation::Info origin=trace.origin();
+		Operation::Origin 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
@@ -515,8 +521,10 @@ size_t Request::register_file(StringBody
 }
 
 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;
@@ -559,12 +567,12 @@ 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, register_file(*file_spec));
+		use_buf(aclass, source, main_alias, register_file(*file_spec));
 }
 
 
 void Request::use_buf(VStateless_class& aclass,
-		      const char* source, 
+		      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);
@@ -572,7 +580,7 @@ void Request::use_buf(VStateless_class&
 	Temp_method temp_method_auto(aclass, auto_method_name, 0);
 
 	// compile loaded class
-	VStateless_class& cclass=compile(&aclass, source, file_no);
+	VStateless_class& cclass=compile(&aclass, source, main_alias, file_no);
 
 	// locate and execute possible @conf[] static
 	VString* vfilespec=
@@ -652,25 +660,19 @@ void Request::output_result(VFile* body_
 	// prepare header: $response:fields without :body
 	response.fields().for_each(add_header_attribute, this);
 
-	const void *client_body;
-	size_t client_content_length;
 	// transcode text body when "text/*" or simple result
 	if(body_file_content_type)
 		if(HashStringValue *hash=body_file_content_type->get_hash())
 			body_file_content_type=hash->get(value_name);
-	if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0) {
-		Charset::transcode(
-			charsets.source(), body_file->value_ptr(), body_file->value_size(),
-			charsets.client(), client_body, client_content_length
-		);
-	} else {
-		client_body=body_file->value_ptr();
-		client_content_length=body_file->value_size();
-	}
+	String::C output(body_file->value_ptr(), body_file->value_size());
+	if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0)
+		output=Charset::transcode(output, 
+			charsets.source(), 
+			charsets.client());
 
 	// prepare header: content-length
 	char content_length_cstr[MAX_NUMBER];
-	snprintf(content_length_cstr, MAX_NUMBER, "%u", client_content_length);
+	snprintf(content_length_cstr, MAX_NUMBER, "%u", output.length);
 	SAPI::add_header_attribute(sapi_info, "content-length", content_length_cstr);
 
 	// send header
@@ -678,7 +680,7 @@ void Request::output_result(VFile* body_
 	
 	// send body
 	if(!header_only)
-		SAPI::send_body(sapi_info, client_body, client_content_length);
+		SAPI::send_body(sapi_info, output.str, output.length);
 }
 
 const String& Request::mime_type_of(const char* user_file_name_cstr) {
@@ -725,8 +727,9 @@ const Request::Trace Request::Exception_
 			fbottom++;
 		} else if(result.name()==problem_source) // it is that same guy?
 			fbottom++; // throw away that trace
-		else // stack top contains not us
-			result.clear();
+		// else stack top contains not us, 
+		//	leaving result intact
+		//	it would help ^throw
 	}
 
 	return result;
@@ -752,7 +755,7 @@ Request::Exception_details Request::get_
 
 	// $.file lineno colno
 	if(trace) {
-		const Operation::Info origin=trace.origin();
+		const Operation::Origin 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));