--- parser3/src/main/pa_request.C	2001/03/19 17:56:28	1.56
+++ parser3/src/main/pa_request.C	2001/03/20 17:21:53	1.61.2.1
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_request.C,v 1.56 2001/03/19 17:56:28 paf Exp $
+	$Id: pa_request.C,v 1.61.2.1 2001/03/20 17:21:53 paf Exp $
 */
 
 #include <string.h>
@@ -15,7 +15,6 @@
 #include "pa_wwrapper.h"
 #include "pa_vclass.h"
 #include "_root.h"
-#include "_env.h"
 #include "_table.h"
 #include "pa_globals.h"
 #include "pa_vint.h"
@@ -44,7 +43,6 @@ Request::Request(Pool& apool,
 	classes().put(*root_class_name, &ROOT);
 	// table class
 	classes().put(*table_class_name, table_class);	
-//	table_class->set_name(*table_class_name);
 
 	// env class
 	classes().put(*env_class_name, &env);
@@ -65,7 +63,7 @@ static void output_response_attribute(co
 		return;
 
 	String attribute(aattribute.pool());
-	attribute.append(aattribute, String::Untaint_lang::HEADER, true);
+	attribute.append(aattribute, String::UL_HEADER, true);
 
 	(*service_funcs.output_header_attribute)(
 		attribute.cstr(), 
@@ -300,12 +298,12 @@ void Request::core(Exception& system_exc
 
 }
 
-/// \todo find|solve cyclic dependences
+/// @todo find|solve cyclic dependences
 VStateless_class *Request::use_file(
 									const char *file, bool fail_on_read_problem,
 									const String *name, 
 									VStateless_class *base_class) {
-	char *source=file_read(pool(), file, fail_on_read_problem);
+	char *source=file_read_text(pool(), file, fail_on_read_problem);
 	if(!source)
 		return base_class;
 
@@ -353,7 +351,7 @@ char *Request::absolute(const char *name
 		strcat(result, name);
 		return result;
 	} else 
-		return relative(info.uri, name);
+		return relative(info.path_translated, name);
 }
 
 void Request::output_result(const String& body_string) {