--- parser3/src/classes/xdoc.C	2001/10/23 14:43:44	1.34
+++ parser3/src/classes/xdoc.C	2001/11/09 12:09:53	1.44
@@ -2,9 +2,9 @@
 	Parser: @b xdoc parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: xdoc.C,v 1.34 2001/10/23 14:43:44 parser Exp $
+	$Id: xdoc.C,v 1.44 2001/11/09 12:09:53 paf Exp $
 */
 #include "pa_types.h"
 #include "classes.h"
@@ -511,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);
@@ -533,7 +533,8 @@ static void _set(Request& r, const Strin
 	Temp_lang temp_lang(r, String::UL_XML);
 	const String& xml=r.process(vxml).as_string();
 
-	std::istrstream stream(xml.cstr());
+	std::istrstream stream(
+		xml.cstr(String::UL_UNSPECIFIED, r.connection));
 	const XalanParsedSource* parsedSource;
 
 	try {
@@ -611,79 +612,18 @@ 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),  
 		XalanDOMString(meaning_cstr));
 }
-/*
-static void _transform(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
-
-	// params
-	if(params->size()>1) {
-		Value& vparams=params->as_no_junction(1, "transform parameters parameter must be string");
-		if(vparams.is_defined())
-			if(Hash *params=vparams.get_hash())
-				params->for_each(add_xslt_param, &vdoc.transformer());
-			else
-				throw Exception(0, 0,
-					&method_name,
-					"transform parameters parameter must be hash");
-	}
-
-	// source
-	const XalanParsedSource &parsed_source=vdoc.get_parsed_source(pool, &method_name);
-
-	// stylesheet
-	const String& stylesheet_file_name=params->as_string(0, "file name must be string");
-	const String& stylesheet_filespec=r.absolute(stylesheet_file_name);
-	//_asm int 3;
-	Stylesheet_connection& connection=XSLT_stylesheet_manager->get_connection(stylesheet_filespec);
-
-	// target
-	XalanDocument* target=vdoc.parser_liaison().createDocument();
-
-	// transform
-	try {
-		vdoc.transformer().transform2(
-			parsed_source, 
-			&connection.stylesheet(true/*nocache* /), 
-			target);
-	}
-	catch (XSLException& e)	{
-		connection.close();
-		Exception::provide_source(pool, &stylesheet_file_name, e);
-	}
-	catch (SAXParseException& e)	{
-		connection.close();
-		Exception::provide_source(pool, &stylesheet_file_name, e);
-	}
-	catch (SAXException& e)	{
-		connection.close();
-		Exception::provide_source(pool, &stylesheet_file_name, e);
-	}
-	catch (XMLException& e) {
-		connection.close();
-		Exception::provide_source(pool, &stylesheet_file_name, e);
-	}
-	catch(const XalanDOMException& e)	{
-		connection.close();
-		Exception::provide_source(pool, &stylesheet_file_name, e);
-	}
 
-	// write out result
-	VXdoc& result=*new(pool) VXdoc(pool);
-	result.set_document(*target);
-	r.write_no_lang(result);
-}
-*/
 static void _transform(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
@@ -700,9 +640,6 @@ static void _transform(Request& r, const
 					"transform parameters parameter must be hash");
 	}
 
-	// source
-	XalanDocument &xalan_document=vdoc.get_document(pool, &method_name);
-
 	// stylesheet
 	const String& stylesheet_file_name=params->as_string(0, "file name must be string");
 	const String& stylesheet_filespec=r.absolute(stylesheet_file_name);
@@ -710,14 +647,27 @@ static void _transform(Request& r, const
 	Stylesheet_connection& connection=stylesheet_manager->get_connection(stylesheet_filespec);
 
 	// target
-	XalanDocument* target=vdoc.parser_liaison().createDocument();
+	XalanDocument* target=vdoc.parser_xerces_liaison().createDocument();
 
 	// transform
 	try {
-		vdoc.transformer().transform2(
-			&xalan_document, 
-			&connection.stylesheet(true/*nocache*/), 
-			target);
+		// note: 
+		//   actually, never found any difference between the two
+		//   but still there some extra "xerces" words at start of transform body
+		//   wich were originally "xalan"
+		//   not daring to change that
+		if(vdoc.has_parsed_source()) { // set|load, not create?
+			vdoc.transformer().transform2(
+				vdoc.get_parsed_source(pool, &method_name), 
+				&connection.stylesheet(true/*nocache*/), 
+				target);
+		} else {
+			target=vdoc.parser_xerces_liaison().createDocument();
+			vdoc.transformer().transform2(
+				vdoc.get_document(pool, &method_name), 
+				&connection.stylesheet(true/*nocache*/), 
+				target);
+		}
 	}
 	catch (XSLException& e)	{
 		connection.close();
@@ -740,6 +690,9 @@ static void _transform(Request& r, const
 		Exception::provide_source(pool, &stylesheet_file_name, e);
 	}
 
+	// close
+	connection.close();
+
 	// write out result
 	VXdoc& result=*new(pool) VXdoc(pool, target, false/*owns not*/);
 	r.write_no_lang(result);