--- parser3/src/classes/xdoc.C	2003/12/01 12:55:03	1.123
+++ parser3/src/classes/xdoc.C	2004/01/30 14:35:11	1.129
@@ -9,7 +9,7 @@
 
 #ifdef XML
 
-static const char * const IDENT_XDOC_C="$Date: 2003/12/01 12:55:03 $";
+static const char * const IDENT_XDOC_C="$Date: 2004/01/30 14:35:11 $";
 
 #include "gdome.h"
 #include "libxml/tree.h"
@@ -413,7 +413,7 @@ static void _create(Request& r, MethodPa
 		Temp_lang temp_lang(r, String::L_XML);
 		const String& xml=r.process_to_string(param);
 
-		const char* cstr=xml.cstr(String::L_UNSPECIFIED);
+		const char* cstr=xml.cstr(String::L_UNSPECIFIED, 0, &r.charsets);
 		document=(GdomeDocument *)
 			gdome_xml_n_mkref((xmlNode *)xmlParseMemory(
 				cstr, strlen(cstr)
@@ -569,10 +569,6 @@ static void prepare_output_options(Reque
 				param_option_over_output_option(*options, "omit-xml-declaration", oo.omitXmlDeclaration);
 				// $.standalone[yes|no]
 				param_option_over_output_option(*options, "standalone", oo.standalone);
-				// $.doctype-public[?]
-				param_option_over_output_option(*options, "doctype-public", oo.doctypePublic);
-				// $.doctype-system[?]
-				param_option_over_output_option(*options, "doctype-system", oo.doctypeSystem);
 				// $.indent[yes|no]
 				param_option_over_output_option(*options, "indent", oo.indent);
 				// $.media-type[text/{html|xml|plain}]
@@ -638,14 +634,16 @@ static Xdoc2buf_result xdoc2buf(Request&
 	OOS2STYLE(method);
 	OOS2STYLE(encoding);
 	OOS2STYLE(mediaType);
-	OOS2STYLE(doctypeSystem);
-	OOS2STYLE(doctypePublic);
+//	OOS2STYLE(doctypeSystem);
+	//OOS2STYLE(doctypePublic);
 	OOE2STYLE(indent);
 	OOS2STYLE(version);
 	OOE2STYLE(standalone);
 	OOE2STYLE(omitXmlDeclaration);
 
 	xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document());
+	if(encoder)
+		document->encoding=BAD_CAST xmlMemStrdup(encoder->name);
 	if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0) {
 		GdomeException exc=0;
 		throw XmlException(0, exc);
@@ -785,8 +783,6 @@ static VXdoc& _transform(Request& r, con
 	oo.method=stylesheet->method?&r.transcode(stylesheet->method):0;
 	oo.encoding=stylesheet->encoding?&r.transcode(stylesheet->encoding):0;
 	oo.mediaType=stylesheet->mediaType?&r.transcode(stylesheet->mediaType):0;
-	oo.doctypeSystem=stylesheet->doctypeSystem?&r.transcode(stylesheet->doctypeSystem):0;
-	oo.doctypePublic=stylesheet->doctypePublic?&r.transcode(stylesheet->doctypePublic):0;
 	oo.indent=stylesheet->indent!=0;
 	oo.version=stylesheet->version?&r.transcode(stylesheet->version):0;
 	oo.standalone=stylesheet->standalone!=0;
@@ -825,9 +821,6 @@ static void _transform(Request& r, Metho
 			static_cast<VXdoc *>(vxdoc)->get_document());
 		// compile xdoc stylesheet
 		xsltStylesheet_auto_ptr stylesheet_ptr(xsltParseStylesheetDoc(document)); 
-		// strange thing - xsltParseStylesheetDoc records document and destroys it in stylesheet destructor
-		// we don't need that
-		stylesheet_ptr->doc=0;
 		if(xmlHaveGenericErrors()) {
 			GdomeException exc=0;
 			throw XmlException(0, exc);
@@ -836,6 +829,9 @@ static void _transform(Request& r, Metho
 			throw Exception("xml",
 				0,
 				"stylesheet failed to compile");
+		// strange thing - xsltParseStylesheetDoc records document and destroys it in stylesheet destructor
+		// we don't need that
+		stylesheet_ptr->doc=0;
 
 		// transform!
 		result=&_transform(r, 0,
@@ -845,7 +841,7 @@ static void _transform(Request& r, Metho
 		// extablish stylesheet connection
 		const String& stylesheet_filespec=
 			r.absolute(params.as_string(0, "stylesheet must be file name (string) or DOM document (xdoc)"));
-		Stylesheet_connection_ptr connection=stylesheet_manager.get_connection(stylesheet_filespec);
+		Stylesheet_connection_ptr connection=stylesheet_manager->get_connection(stylesheet_filespec);
 
 		// load and compile file to stylesheet [or get cached if any]
 		// transform!