--- parser3/src/classes/xdoc.C	2001/10/26 15:55:20	1.37
+++ parser3/src/classes/xdoc.C	2001/11/01 15:45:27	1.41
@@ -4,7 +4,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: xdoc.C,v 1.37 2001/10/26 15:55:20 paf Exp $
+	$Id: xdoc.C,v 1.41 2001/11/01 15:45:27 paf Exp $
 */
 #include "pa_types.h"
 #include "classes.h"
@@ -77,9 +77,7 @@ static void _createElement(Request& r, c
 	Pool& pool=r.pool();
 	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
 
-	Temp_lang temp_lang(r, String::UL_XML);
-	Value& tagName_code=params->as_junction(0, "tagName must be string");
-	const String& tagName=r.process(tagName_code).as_string();
+	const String& tagName=params->as_string(0, "tagName must be string");
 
 	try {
 		XalanNode *node=
@@ -111,9 +109,7 @@ static void _createTextNode(Request& r,
 	Pool& pool=r.pool();
 	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
 
-	Temp_lang temp_lang(r, String::UL_XML);
-	Value& data_code=params->as_junction(0, "data must be string");
-	const String& data=r.process(data_code).as_string();
+	const String& data=params->as_string(0, "data must be string");
 
 	XalanNode *node=
 		vdoc.get_document(pool, &method_name).
@@ -515,9 +511,9 @@ static void _file(Request& r, const Stri
 		Value *vcontent_type;
 		if(charset) {
 			VHash *vhcontent_type=new(pool) VHash(pool);
-			vhcontent_type->hash().put(*value_name, new(pool) VString(*scontent_type));
+			vhcontent_type->hash(&method_name).put(*value_name, new(pool) VString(*scontent_type));
 			String *scharset=new(pool) String(pool, charset);
-			vhcontent_type->hash().put(*new(pool) String(pool, "charset"), new(pool) VString(*scharset));
+			vhcontent_type->hash(&method_name).put(*new(pool) String(pool, "charset"), new(pool) VString(*scharset));
 			vcontent_type=vhcontent_type;
 		} else
 			vcontent_type=new(pool) VString(*scontent_type);
@@ -615,11 +611,12 @@ static void _load(Request& r, const Stri
 	vdoc.set_parsed_source(*parsedSource);
 }
 
+/// @test lang=String::UL_UNSPECIFIED?
 static void add_xslt_param(const Hash::Key& aattribute, Hash::Val *ameaning, 
 						   void *info) {
 	XalanTransformer2& transformer=*static_cast<XalanTransformer2 *>(info);
-	const char *attribute_cstr=aattribute.cstr();
-	const char *meaning_cstr=static_cast<Value *>(ameaning)->as_string().cstr();
+	const char *attribute_cstr=aattribute.cstr(String::UL_UNSPECIFIED);
+	const char *meaning_cstr=static_cast<Value *>(ameaning)->as_string().cstr(String::UL_UNSPECIFIED);
 
 	transformer.setStylesheetParam(
 		XalanDOMString(attribute_cstr),