--- parser3/src/main/pa_request.C	2003/02/17 16:44:57	1.245.2.24
+++ parser3/src/main/pa_request.C	2003/03/08 16:37:51	1.245.2.35
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_REQUEST_C="$Date: 2003/02/17 16:44:57 $";
+static const char* IDENT_REQUEST_C="$Date: 2003/03/08 16:37:51 $";
 
 #include "pa_sapi.h"
 #include "pa_common.h"
@@ -16,12 +16,17 @@ static const char* IDENT_REQUEST_C="$Dat
 #include "pa_vint.h"
 #include "pa_vmethod_frame.h"
 #include "pa_types.h"
+#include "pa_venv.h"
+#include "pa_vmath.h"
+#include "pa_vstatus.h"
+#include "pa_vrequest.h"
 #include "pa_vtable.h"
 #include "pa_vfile.h"
 #include "pa_dictionary.h"
 #include "pa_charset.h"
 #include "pa_charsets.h"
 #include "pa_cache_managers.h"
+#include "pa_vmail.h"
 
 // consts
 
@@ -79,7 +84,7 @@ VHashPtr exception2vhash(Pool& pool, con
 
 //
 Request::Request(Pool& apool, SAPI_Info& asapi_info, Request_info& arequest_info, 
-				 uchar adefault_lang, bool status_allowed):
+				 String_UL adefault_lang, bool status_allowed):
 	// private
 	fpool(apool),
 	anti_endless_execute_recoursion(0),
@@ -130,7 +135,7 @@ Request::Request(Pool& apool, SAPI_Info&
 	/// methodless
 	// env class
 	classes().put(StringPtr(new String(ENV_CLASS_NAME)), 
-			ValuePtr(new VEnv(asapi_info)));
+			ValuePtr(new VEnv(pool(), asapi_info)));
 	// status class
 	if(status_allowed)
 		classes().put(StringPtr(new String(STATUS_CLASS_NAME)), 
@@ -152,7 +157,7 @@ Request::Request(Pool& apool, SAPI_Info&
 	classes().put(mail->get_class()->base_class()->name(), mail);	
 	// math class
 	{
-		ValuePtr math(new VMail);
+		ValuePtr math(new VMath);
 		classes().put(math->get_class()->base_class()->name(), math);	
 	}
 }
@@ -161,7 +166,7 @@ Request::~Request() {
 #ifdef XML
 	// if for some strange reason xml generic errors failed to be reported, free them up
 	if(const char* xml_generic_errors=xmlGenericErrors()) {
-		SAPI::log(pool(), "warning: unreported xmlGenericErrors: %s", xml_generic_errors);
+		SAPI::log(sapi_info, "warning: unreported xmlGenericErrors: %s", xml_generic_errors);
 		free((void *)xml_generic_errors);
 	}
 #endif
@@ -288,7 +293,7 @@ gettimeofday(&mt[0],NULL);
 		cookie->fill_fields(pool(), request_info);
 
 		// filling mail received
-		mail->fill_received(pool(), request_info);
+		mail->fill_received(*this);
 
 #ifdef RESOURCES_DEBUG
 //measure:after compile
@@ -425,7 +430,7 @@ t[9]-t[3]
 						TablePtr stack_trace(new Table(Exception::undefined_source, stack_trace_columns));
 						Array_iterator<StringPtr> tracei(exception_trace);
 						while(tracei.has_next()) {
-							Table::element_type row;
+							Table::element_type row(new ArrayString);
 
 							StringPtr name=tracei.next();
 							*row+=name; // name column
@@ -433,9 +438,9 @@ t[9]-t[3]
 							const String_fragment::Origin& origin=name->origin();
 							if(origin.file) {
 								*row+=StringPtr(new String(origin.file, 0, true)); // file column
-								char *buf=(char *)malloc(MAX_NUMBER);
-								size_t buf_size=snprintf(buf, MAX_NUMBER, "%d", 1+origin.line);
-								*row+=StringPtr(new String(buf, buf_size, true)); // line column
+								*row+=StringPtr(new String(
+									pool().format_integer(1+origin.line), 
+									0, true)); // line column
 							}
 #endif
 							*stack_trace+=row;
@@ -453,7 +458,7 @@ t[9]-t[3]
 				// doing that ugly
 
 				// make up result: $origin $source $comment $type $code
-				char *buf=(char *)malloc(MAX_STRING);
+				char *buf=new(pool()) char[MAX_STRING];
 				size_t printed=0;
 				if(StringPtr problem_source=e.problem_source()) {
 #ifndef NO_STRING_ORIGIN
@@ -554,12 +559,11 @@ VStateless_classPtr Request::use_buf(VSt
 
 	// locate and execute possible @conf[] static
 	VStringPtr vfilespec(new VString(filespec));
-	const Method *method_called;
-	execute_nonvirtual_method(cclass, 
+	Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, 
 		conf_method_name, vfilespec,
-		false/*no result needed*/, &method_called);
-	if(method_called)
-		configure_admin(cclass, method_called->name);
+		false/*no string result needed*/);
+	if(executed.method)
+		configure_admin(cclass, executed.method->name);
 
 	// locate and execute possible @auto[] static
 	execute_nonvirtual_method(cclass, 
@@ -678,3 +682,34 @@ StringPtr Request::mime_type_of(const ch
 bool Request::origins_mode() {
 	return main_class->get_element(origins_mode_name, *main_class, false)!=0;  // $ORIGINS mode
 }
+
+#ifdef XML
+
+GdomeDOMString_auto_ptr Request::transcode(StringPtr s) {
+	return charsets.source().transcode(s);
+}
+
+StringPtr Request::transcode(GdomeDOMString* s
+#ifndef NO_STRING_ORIGIN
+	, StringPtr origin
+#endif
+	) {
+	return charsets.source().transcode(pool(), s
+#ifndef NO_STRING_ORIGIN
+		, origin
+#endif
+		);
+}
+
+StringPtr Request::transcode(xmlChar* s
+#ifndef NO_STRING_ORIGIN
+	, StringPtr origin
+#endif
+	) {
+	return charsets.source().transcode(pool(), s
+#ifndef NO_STRING_ORIGIN
+		, origin
+#endif
+		);
+}
+#endif