--- parser3/src/main/pa_request.C	2001/03/24 10:54:46	1.73
+++ parser3/src/main/pa_request.C	2001/03/24 19:12:20	1.78
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_request.C,v 1.73 2001/03/24 10:54:46 paf Exp $
+	$Id: pa_request.C,v 1.78 2001/03/24 19:12:20 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -21,6 +21,7 @@
 #include "pa_vint.h"
 #include "pa_vmframe.h"
 #include "pa_types.h"
+#include "pa_vtable.h"
 
 /// $limits.post_max_size default 10M
 const size_t MAX_POST_SIZE_DEFAULT=10*0x400*400;
@@ -39,7 +40,7 @@ Request::Request(Pool& apool,
 	fclasses(apool),
 	fdefault_lang(adefault_lang), flang(adefault_lang),
 	info(ainfo),
-	fdefault_content_type(0),
+	default_content_type(0),
 	used_files(apool)
 {
 	// root superclass, 
@@ -95,31 +96,36 @@ void Request::core(const char *root_auto
 		
 		// loading root auto.p 
 		if(root_auto_path) {
-			strncpy(auto_filespec, root_auto_path, MAX_STRING-strlen("/" AUTO_FILE_NAME));
-			strcat(auto_filespec, "/" AUTO_FILE_NAME);
+			String& filespec=*NEW String(pool());
+			filespec.APPEND(root_auto_path, 0, "root_auto", 0);
+			filespec.APPEND_CONST("/" AUTO_FILE_NAME);
 			main_class=use_file(
-				auto_filespec, root_auto_fail,
+				filespec, root_auto_fail,
 				main_class_name, main_class);
 		}
 
 		// $MAIN:limits hash used here,
 		//	until someone with less privileges have overriden them
-		Value *limits=main_class?main_class->get_element(*limits_name):0;
-		Value *element;
-		// $limits.post_max_size default 10M
-		element=limits?limits->get_element(*post_max_size_name):0;
-		size_t value=element?(size_t)element->get_double():0;
-		size_t post_max_size=value?value:MAX_POST_SIZE_DEFAULT;
+		{
+			Value *limits=main_class?main_class->get_element(*limits_name):0;
+			// $limits.post_max_size default 10M
+			Value *element=limits?limits->get_element(*post_max_size_name):0;
+			size_t value=element?(size_t)element->get_double():0;
+			size_t post_max_size=value?value:MAX_POST_SIZE_DEFAULT;
+			
+			form.fill_fields(*this, post_max_size);
+		}
 
-		form.fill_fields(*this, post_max_size);
+		// filling cookies
 		cookie.fill_fields(*this);
 
 		// loading site auto.p
 		if(site_auto_path) {
-			strncpy(auto_filespec, site_auto_path, MAX_STRING-strlen("/" AUTO_FILE_NAME));
-			strcat(auto_filespec, "/" AUTO_FILE_NAME);
+			String& filespec=*NEW String(pool());
+			filespec.APPEND(site_auto_path, 0, "site_auto", 0);
+			filespec.APPEND_CONST("/" AUTO_FILE_NAME);
 			main_class=use_file(
-				auto_filespec, site_auto_fail,
+				filespec, site_auto_fail,
 				main_class_name, main_class);
 		}
 
@@ -128,16 +134,16 @@ void Request::core(const char *root_auto
 		// all assigned bases from upper dir
 		{
 			/* /document/root */
-			char *monkey_auto_path=
+			char *file_spec=
 				(char *)malloc(strlen(info.path_translated)+strlen(AUTO_FILE_NAME)+1);
-			strcpy(monkey_auto_path, info.document_root);
+			strcpy(file_spec, info.document_root);
 
 			/* /requested/file.html */
 			char *branches=(char *)malloc(strlen(info.path_translated)+1);
 			strcpy(branches, info.path_translated+strlen(info.document_root));
 			char *next=branches;
 
-			char *append_here=monkey_auto_path+strlen(monkey_auto_path);
+			char *append_here=file_spec+strlen(file_spec);
 			size_t slash_auto_p_size=strlen("/" AUTO_FILE_NAME);
 			while(true) {
 				char *step=lsplit(&next, '/');
@@ -148,7 +154,9 @@ void Request::core(const char *root_auto
 					memcpy(append_here, "/" AUTO_FILE_NAME, slash_auto_p_size+1);
 					append_here++/* / */;
 
-					main_class=use_file(monkey_auto_path, false/*ignore read problem*/,
+					String& sfile_spec=*NEW String(pool());
+					sfile_spec.APPEND(file_spec, 0, "scanned", 0);
+					main_class=use_file(sfile_spec, false/*ignore read problem*/,
 						main_class_name, main_class);
 				} else
 					break;
@@ -156,12 +164,21 @@ void Request::core(const char *root_auto
 		}
 
 		// compiling requested file
-		main_class=use_file(info.path_translated, true/*don't ignore read problem*/,
+		String& spath_translated=*NEW String(pool());
+		spath_translated.APPEND(info.path_translated, 0, "user-request", 0);
+		main_class=use_file(spath_translated, true/*don't ignore read problem*/,
 			main_class_name, main_class);
 
 		// $MAIN:defaults
-		Value *defaults=main_class?main_class->get_element(*defaults_name):0;
-		fdefault_content_type=defaults?defaults->get_element(*content_type_name):0;
+		Value *defaults=main_class->get_element(*defaults_name);
+		// value must be allocated on request's pool for that pool used on
+		// meaning constructing @see attributed_meaning_to_string
+		default_content_type=defaults?
+			defaults->get_element(*content_type_name)
+			:NEW VString(*NEW String(pool(), "text/html"));
+		if(Value *element=main_class->get_element(*html_typo_name))
+			if(VTable *vtable=element->get_vtable())
+				pool().set_tag(&vtable->table());
 
 		// execute @main[]
 		const String *body_string=execute_method(*main_class, *main_method_name);
@@ -179,9 +196,33 @@ void Request::core(const char *root_auto
 		// OK. write out the result
 		output_result(*body_string, header_only);
 	} 
-	CATCH(e) {
+	CATCH(e) { // request handling problem
+		// we're returning not result, but error explanation
 		TRY {
-			// we're returning not result, but error explanation
+			// log the beast
+			const String *problem_source=e.problem_source();
+			if(problem_source)
+				SAPI::log(pool(),
+#ifndef NO_STRING_ORIGIN
+					"%s(%d): "
+#endif
+					"'%s' %s [%s %s]",
+#ifndef NO_STRING_ORIGIN
+					problem_source->origin().file?problem_source->origin().file:"global",
+					problem_source->origin().line,
+#endif
+					problem_source->cstr(),
+					e.comment(),
+					e.type()?e.type()->cstr():"-",
+					e.code()?e.code()->cstr():"-"
+				);
+			else
+				SAPI::log(pool(),
+					"%s [%s %s]",
+					e.comment(),
+					e.type()?e.type()->cstr():"-",
+					e.code()?e.code()->cstr():"-"
+					);
 
 			// reset language to default
 			flang=fdefault_lang;
@@ -326,21 +367,20 @@ void Request::core(const char *root_auto
 
 }
 
-VStateless_class *Request::use_file(const char *file, bool fail_on_read_problem,
+VStateless_class *Request::use_file(const String& file_spec, bool fail_on_read_problem,
 									const String *name, 
 									VStateless_class *base_class) {
 	// cyclic dependence check
-	String& sfile=*NEW String(pool(), file);
-	if(used_files.get(sfile))
+	if(used_files.get(file_spec))
 		return base_class;
-	used_files.put(sfile, (Hash::Val *)true);
+	used_files.put(file_spec, (Hash::Val *)true);
 
 
-	char *source=file_read_text(pool(), file, fail_on_read_problem);
+	char *source=file_read_text(pool(), file_spec, fail_on_read_problem);
 	if(!source)
 		return base_class;
 
-	return use_buf(source, file, 0/*new class*/, name, base_class);
+	return use_buf(source, file_spec.cstr(), 0/*new class*/, name, base_class);
 }
 
 VStateless_class *Request::use_buf(const char *source, const char *file,
@@ -367,23 +407,25 @@ void Request::fail_if_junction_(bool is,
 			msg);
 }
 
-char *Request::relative(const char *path, const char *file) {
-    char *result=(char *)malloc(strlen(path)+strlen(file)+1);
-	strcpy(result, path);
-    rsplit(result, '/');
-    strcat(result, "/");
-    strcat(result, file);
+const String& Request::relative(const char *apath, const String& relative_name) {
+	int lpath_buf_size=strlen(apath)+1;
+    char *lpath=(char *)malloc(lpath_buf_size);
+	memcpy(lpath, apath, lpath_buf_size);
+    rsplit(lpath, '/');
+	String& result=*NEW String(pool(), lpath);
+    result.APPEND_CONST("/");
+	result.append(relative_name, String::UL_PASS_APPENDED);
     return result;
 }
 
-char *Request::absolute(const char *name) {
-	if(name[0]=='/') {
-		char *result=(char *)malloc(strlen(info.document_root)+strlen(name)+1);
-		strcpy(result, info.document_root);
-		strcat(result, name);
+const String& Request::absolute(const String& relative_name) {
+	char *relative_name_cstr=relative_name.cstr();
+	if(relative_name_cstr[0]=='/') {
+		String& result=*NEW String(pool(), info.document_root);
+		result.append(relative_name, String::UL_PASS_APPENDED);
 		return result;
 	} else 
-		return relative(info.path_translated, name);
+		return relative(info.path_translated, relative_name);
 }
 
 void Request::output_result(const String& body_string, bool header_only) {
@@ -391,9 +433,7 @@ void Request::output_result(const String
 	cookie.output_result();
 	
 	// set default content-type
-	if(!fdefault_content_type)
-		fdefault_content_type=NEW VString(*NEW String(pool(), "text/html"));
-	response.fields().put_dont_replace(*content_type_name, fdefault_content_type);
+	response.fields().put_dont_replace(*content_type_name, default_content_type);
 
 	// prepare header: $response:fields without :body
 	response.fields().for_each(add_header_attribute, /*excluding*/ body_name);