--- parser3/src/classes/xdoc.C	2002/01/14 17:48:56	1.59
+++ parser3/src/classes/xdoc.C	2002/08/01 11:41:13	1.97
@@ -1,27 +1,32 @@
 /** @file
 	Parser: @b xdoc parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: xdoc.C,v 1.59 2002/01/14 17:48:56 paf Exp $
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-#include "pa_types.h"
+
+#include "classes.h"
 #ifdef XML
 
+static const char* IDENT_XDOC_C="$Date: 2002/08/01 11:41:13 $";
+
 #include "pa_stylesheet_connection.h"
-#include "classes.h"
 #include "pa_request.h"
 #include "pa_vxdoc.h"
 #include "pa_charset.h"
 #include "pa_vfile.h"
 #include "xnode.h"
 
+#include "gdome.h"
+#include "libxml/tree.h"
 extern "C" {
 #include "gdomecore/gdome-xml-node.h"
 #include "gdomecore/gdome-xml-document.h"
 };
+#include "libxslt/xsltInternals.h"
 #include "libxslt/transform.h"
+#include "libxslt/xsltutils.h"
+#include "libxslt/variables.h"
 
 // defines
 
@@ -31,7 +36,6 @@ extern "C" {
 #define XDOC_OUTPUT_METHOD_OPTION_VALUE_XML "xml"
 #define XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML "html"
 #define XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT "text"
-#define XDOC_OUTPUT_DEFAULT_INDENT 4
 
 // class
 
@@ -43,16 +47,116 @@ public:
 	MXdoc(Pool& pool);
 
 public: // Methoded
-	bool used_directly() { return true; }
 	void configure_admin(Request& r);
 };
 
+// helper classes
+
+class xmlOutputBuffer_auto_ptr {
+public:
+	explicit xmlOutputBuffer_auto_ptr(xmlOutputBuffer *_APtr = 0) 
+		: _Owns(_APtr != 0), _Ptr(_APtr) {}
+	xmlOutputBuffer_auto_ptr(const xmlOutputBuffer_auto_ptr& _Y) 
+		: _Owns(_Y._Owns), _Ptr(_Y.release()) {}
+	xmlOutputBuffer_auto_ptr& operator=(const xmlOutputBuffer_auto_ptr& _Y) 
+		{if (this != &_Y)
+			{if (_Ptr != _Y.get())
+				{if (_Owns && _Ptr)
+					xmlOutputBufferClose(_Ptr);
+				_Owns = _Y._Owns; }
+			else if (_Y._Owns)
+				_Owns = true;
+			_Ptr = _Y.release(); }
+		return (*this); }
+	~xmlOutputBuffer_auto_ptr()
+		{if (_Owns && _Ptr)
+			xmlOutputBufferClose(_Ptr); }
+	xmlOutputBuffer& operator*() const 
+		{return (*get()); }
+	xmlOutputBuffer *operator->() const 
+		{return (get()); }
+	xmlOutputBuffer *get() const 
+		{return (_Ptr); }
+	xmlOutputBuffer *release() const 
+		{((xmlOutputBuffer_auto_ptr *)this)->_Owns = false;
+		return (_Ptr); }
+private:
+	bool _Owns;
+	xmlOutputBuffer *_Ptr;
+};
+
+class xsltTransformContext_auto_ptr {
+public:
+	explicit xsltTransformContext_auto_ptr(xsltTransformContext *_APtr = 0) 
+		: _Owns(_APtr != 0), _Ptr(_APtr) {}
+	xsltTransformContext_auto_ptr(const xsltTransformContext_auto_ptr& _Y) 
+		: _Owns(_Y._Owns), _Ptr(_Y.release()) {}
+	xsltTransformContext_auto_ptr& operator=(const xsltTransformContext_auto_ptr& _Y) 
+		{if (this != &_Y)
+			{if (_Ptr != _Y.get())
+				{if (_Owns && _Ptr)
+					xsltFreeTransformContext(_Ptr);
+				_Owns = _Y._Owns; }
+			else if (_Y._Owns)
+				_Owns = true;
+			_Ptr = _Y.release(); }
+		return (*this); }
+	~xsltTransformContext_auto_ptr()
+		{if (_Owns && _Ptr)
+			xsltFreeTransformContext(_Ptr); }
+	xsltTransformContext& operator*() const 
+		{return (*get()); }
+	xsltTransformContext *operator->() const 
+		{return (get()); }
+	xsltTransformContext *get() const 
+		{return (_Ptr); }
+	xsltTransformContext *release() const 
+		{((xsltTransformContext_auto_ptr *)this)->_Owns = false;
+		return (_Ptr); }
+private:
+	bool _Owns;
+	xsltTransformContext *_Ptr;
+};
+
+class xsltStylesheet_auto_ptr {
+public:
+	explicit xsltStylesheet_auto_ptr(xsltStylesheet *_APtr = 0) 
+		: _Owns(_APtr != 0), _Ptr(_APtr) {}
+	xsltStylesheet_auto_ptr(const xsltStylesheet_auto_ptr& _Y) 
+		: _Owns(_Y._Owns), _Ptr(_Y.release()) {}
+	xsltStylesheet_auto_ptr& operator=(const xsltStylesheet_auto_ptr& _Y) 
+		{if (this != &_Y)
+			{if (_Ptr != _Y.get())
+				{if (_Owns && _Ptr)
+					xsltFreeStylesheet(_Ptr);
+				_Owns = _Y._Owns; }
+			else if (_Y._Owns)
+				_Owns = true;
+			_Ptr = _Y.release(); }
+		return (*this); }
+	~xsltStylesheet_auto_ptr()
+		{if (_Owns && _Ptr)
+			xsltFreeStylesheet(_Ptr); }
+	xsltStylesheet& operator*() const 
+		{return (*get()); }
+	xsltStylesheet *operator->() const 
+		{return (get()); }
+	xsltStylesheet *get() const 
+		{return (_Ptr); }
+	xsltStylesheet *release() const 
+		{((xsltStylesheet_auto_ptr *)this)->_Owns = false;
+		return (_Ptr); }
+private:
+	bool _Owns;
+	xsltStylesheet *_Ptr;
+};
+
 // methods
 
 static void writeNode(Request& r,  const String& method_name, GdomeNode *node, 
 					  GdomeException exc) {
 	if(!node || exc)
-		throw Exception(0, 0, 
+		throw Exception(
 			&method_name, 
 			exc);
 
@@ -182,70 +286,6 @@ static void _createEntityReference(Reque
 	writeNode(r, method_name, node, exc);
 }
 
-static void _getElementsByTagName(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
-
-	const String& name=params->as_string(0, "name must be string");
-
-	GdomeException exc;
-	VHash& result=*new(pool) VHash(pool);
-	if(GdomeNodeList *nodes=
-		gdome_doc_getElementsByTagName(
-			vdoc.get_document(&method_name), 
-			pool.transcode(name).get(),
-			&exc)) {
-		gulong length=gdome_nl_length(nodes, &exc);
-		for(gulong i=0; i<length; i++) {
-			String& skey=*new(pool) String(pool);
-			{
-				char *buf=(char *)pool.malloc(MAX_NUMBER);
-				snprintf(buf, MAX_NUMBER, "%d", i);
-				skey << buf;
-			}
-
-			result.hash(0).put(skey, new(pool) VXnode(pool, gdome_nl_item(nodes, i, &exc)));
-		}
-	}
-
-	// write out result
-	r.write_no_lang(result);
-}
-
-static void _getElementsByTagNameNS(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
-
-	// namespaceURI;localName
-	const String& namespaceURI=params->as_string(0, "namespaceURI must be string");
-	const String& localName=params->as_string(0, "localName must be string");
-
-	GdomeException exc;
-	VHash& result=*new(pool) VHash(pool);
-	if(GdomeNodeList *nodes=
-		gdome_doc_getElementsByTagNameNS(
-			vdoc.get_document(&method_name), 
-			pool.transcode(namespaceURI).get(),
-			pool.transcode(localName).get(),
-			&exc)) {
-		gulong length=gdome_nl_length(nodes, &exc);
-		for(gulong i=0; i<length; i++) {
-			String& skey=*new(pool) String(pool);
-			{
-				char *buf=(char *)pool.malloc(MAX_NUMBER);
-				snprintf(buf, MAX_NUMBER, "%d", i);
-				skey << buf;
-			}
-
-			result.hash(0).put(skey, new(pool) VXnode(pool, gdome_nl_item(nodes, i, &exc)));
-		}
-	}
-
-
-	// write out result
-	r.write_no_lang(result);
-}
-
 static void _getElementById(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
@@ -261,75 +301,98 @@ static void _getElementById(Request& r,
 		// write out result
 		VXnode& result=*new(pool) VXnode(pool, node);
 		r.write_no_lang(result);
-	} else if(exc)
-		throw Exception(0, 0, 
+	} else if(exc || xmlHaveGenericErrors())
+		throw Exception(
 			&method_name, 
 			exc);
 }
-/*
-GdomeNode *gdome_doc_importNode (GdomeDocument *self, GdomeNode *importedNode, GdomeBoolean deep, GdomeException *exc);
-GdomeElement *gdome_doc_createElementNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc);
-GdomeAttr *gdome_doc_createAttributeNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc);
-*/
 
-
-static void _create(Request& r, const String& method_name, MethodParams *params) {
-	//_asm int 3;
+static void _importNode(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
 
-	const String& qualifiedName=params->as_string(0, "qualifiedName must be string");
+	GdomeNode *importedNode=
+		as_node(method_name, params, 0, "importedNode must be node");
+	bool deep=
+		params->as_bool(1, "deep must be bool", r);
 
 	GdomeException exc;
-	/*
-	GdomeDocumentType *documentType=gdome_di_createDocumentType (
-		docimpl, 
-		pool.transcode(qualifiedName), 
-		0/*publicId* /, 
-		0/*systemId* /, 
-		&exc);
-	if(!documentType || exc)
-		throw Exception(0, 0, 
+	GdomeNode *outputNode=gdome_doc_importNode(vdoc.get_document(&method_name), 
+		importedNode,
+		deep, &exc);
+	if(exc)
+		throw Exception(
 			&method_name, 
 			exc);
-	*/
-	GdomeDocument *document=gdome_di_createDocument (domimpl, 
-		0/*namespaceURI*/, 
-		pool.transcode(qualifiedName).get(), 
-		0/*doctype*/, 
-		&exc);
-	if(!document || exc)
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
-
-	/// +xalan createXMLDecl ?
 
-	// replace any previous parsed source
-	vdoc.set_document(document);
+	// write out result
+	r.write_no_lang(*new(pool) VXnode(pool, outputNode));
 }
+/*
+GdomeElement *gdome_doc_createElementNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc);
+GdomeAttr *gdome_doc_createAttributeNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc);
+*/
 
-/// @test xmlSAXParseMemory(NULL<<error handler subst, buffer, size, 0)
-static void _set(Request& r, const String& method_name, MethodParams *params) {
-//	_asm int 3;
+static void _create(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
 
-	Value& vxml=params->as_junction(0, "xml must be code");
-	Temp_lang temp_lang(r, String::UL_XML);
-	const String& xml=r.process(vxml).as_string();
+	Value& param=params->get(params->size()-1);
+	GdomeDocument *document;
+	if(param.get_junction()) { // {<?xml?>...}
+		Temp_lang temp_lang(r, String::UL_XML);
+		const String& xml=r.process_to_string(param);
+
+		const char *cstr=xml.cstr(String::UL_UNSPECIFIED);
+		document=(GdomeDocument *)
+			gdome_xml_n_mkref((xmlNode *)xmlParseMemory(
+				cstr, strlen(cstr)
+			));
+		if(!document || xmlHaveGenericErrors()) {
+			GdomeException exc=0;
+			throw Exception(
+				&method_name, 
+				exc);
+		}
+	} else { // [name]
+		const String& qualifiedName=param.as_string();
 
-	GdomeException exc;
-	GdomeDocument *document=gdome_di_createDocFromMemory(domimpl,
-		xml.cstr(String::UL_UNSPECIFIED, r.connection),
-		GDOME_LOAD_PARSING
-		/* GDOME_LOAD_VALIDATING */ 
-		/*|GDOME_LOAD_SUBSTITUTE_ENTITIES */,
-		&exc);
-	if(!document || exc)
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
+		GdomeException exc;
+		/*
+		GdomeDocumentType *documentType=gdome_di_createDocumentType (
+			docimpl, 
+			pool.transcode(qualifiedName), 
+			0/*publicId* /, 
+			0/*systemId* /, 
+			&exc);
+		if(!documentType || exc || xmlHaveGenericErrors())
+			throw Exception(
+				&method_name, 
+				exc);
+		*/
+		document=gdome_di_createDocument (domimpl, 
+			0/*namespaceURI*/, 
+			pool.transcode(qualifiedName).get(), 
+			0/*doctype*/, 
+			&exc);
+		if(!document || exc || xmlHaveGenericErrors())
+			throw Exception(
+				&method_name, 
+				exc);
+
+		/// +xalan createXMLDecl ?
+	}
+	
+	// URI 
+	const char *URI_cstr;
+	if(params->size()>1) { // absolute(param)
+		const String& URI=params->as_string(0, "URI must be string");
+		URI_cstr=r.absolute(URI).cstr();
+	} else // default = disk path to requested document
+		URI_cstr=r.info.path_translated;
+	xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document);
+	if(URI_cstr)
+		doc->URL=pool.transcode_buf2xchar(URI_cstr, strlen(URI_cstr));
 
 	// replace any previous parsed source
 	vdoc.set_document(document);
@@ -343,31 +406,25 @@ static void _load(Request& r, const Stri
 	const String& file_name=params->as_string(0, "uri must be string");
 	const String& uri=r.absolute(file_name);
 	
-	GdomeException exc;
-	GdomeDocument *document=gdome_di_createDocFromURI(domimpl,
-		uri.cstr(),
-		GDOME_LOAD_PARSING
-		/*GDOME_LOAD_VALIDATING */ 
-		/*|GDOME_LOAD_SUBSTITUTE_ENTITIES */,
-		&exc);
-	if(!document || exc)
-		throw Exception(0, 0, 
-			&method_name, 
+	GdomeDocument *document=(GdomeDocument *)
+		gdome_xml_n_mkref((xmlNode *)xmlParseFile(uri.cstr()));
+	if(!document || xmlHaveGenericErrors()) {
+		GdomeException exc=0;
+		throw Exception(
+			&uri, 
 			exc);
+	}
 
 	// replace any previous parsed source
 	vdoc.set_document(document);
 }
 
-/*
 static void param_option_over_output_option(Pool& pool, 
 											Hash *param_options, const char *option_name,
-											XalanDOMString& output_option) {
-	if(Value *value=static_cast<Value *>(param_options->get(*new(pool) 
-		String(pool, option_name)))) {
-		output_option.clear();
-		output_option.append(value->as_string().cstr());
-	}
+											const String *& output_option) {
+	if(Value *value=static_cast<Value *>(param_options->get(*new(pool) String(pool, 
+		option_name))))
+		output_option=&value->as_string();
 }
 static void param_option_over_output_option(Pool& pool, 
 											Hash *param_options, const char *option_name,
@@ -380,26 +437,15 @@ static void param_option_over_output_opt
 		else if(s=="no")
 			output_option=false;
 		else
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&s,
 				"%s must be either 'yes' or 'no'", option_name);
 	}
 }
 
- static std::auto_ptr<FormatterListener> create_optioned_listener(
-									 Pool& pool, const String& method_name, MethodParams *params, int index,
-									 VXdoc::Output_options& oo, Writer& writer) {
-/*
-	XalanDOMString encoding;
-	XalanDOMString mediaType;
-	XalanDOMString doctypeSystem;
-	XalanDOMString doctypePublic;
-	bool doIndent;
-	XalanDOMString version;
-	XalanDOMString standalone;
-	bool xmlDecl;
-* /
-
+static void prepare_output_options(
+								   Pool& pool, const String& method_name, MethodParams *params, int index,
+								   VXdoc::Output_options& oo) {
 /*
 <xsl:output
   !method = "xml" | "html" | "text" | qname-but-not-ncname 
@@ -412,12 +458,7 @@ static void param_option_over_output_opt
   cdata-section-elements = qnames 
   !indent = "yes" | "no"
   !media-type = string /> 
-* /
-
-	/*
-		fToXML->setStripCData(stripCData);
-		fToXML->setEscapeCData(escapeCData);
-	* /
+*/
 
 	// configuring with options from parameter...
 	if(params->size()>index) {
@@ -427,16 +468,14 @@ static void param_option_over_output_opt
 				// $.method[xml|html|text]
 				if(Value *vmethod=static_cast<Value *>(options->get(*new(pool) 
 					String(pool, XDOC_OUTPUT_METHOD_OPTION_NAME))))
-					oo.method=vmethod->as_string().cstr();
+					oo.method=&vmethod->as_string();
 
 				// $.version[1.0]
 				param_option_over_output_option(pool, options, "version", oo.version);
 				// $.encoding[windows-1251|...]
 				param_option_over_output_option(pool, options, "encoding", oo.encoding);
 				// $.omit-xml-declaration[yes|no]
-				bool omit_xml_declaration=!oo.xmlDecl;
-				param_option_over_output_option(pool, options, "omit-xml-declaration", omit_xml_declaration);
-				oo.xmlDecl=!omit_xml_declaration;
+				param_option_over_output_option(pool, options, "omit-xml-declaration", oo.omitXmlDeclaration);
 				// $.standalone[yes|no]
 				param_option_over_output_option(pool, options, "standalone", oo.standalone);
 				// $.doctype-public[?]
@@ -444,7 +483,7 @@ static void param_option_over_output_opt
 				// $.doctype-system[?]
 				param_option_over_output_option(pool, options, "doctype-system", oo.doctypeSystem);
 				// $.indent[yes|no]
-				param_option_over_output_option(pool, options, "indent", oo.doIndent);
+				param_option_over_output_option(pool, options, "indent", oo.indent);
 				// $.media-type[text/{html|xml|plain}]
 				param_option_over_output_option(pool, options, "media-type", oo.mediaType);				 
 			}
@@ -452,252 +491,284 @@ static void param_option_over_output_opt
 	}
 
 	// default encoding from pool
-	if(oo.encoding.empty())
-		oo.encoding.append(pool.get_source_charset().name().cstr());
+	if(!oo.encoding)
+		oo.encoding=&pool.get_source_charset().name();
 	// default method=xml
 	if(!oo.method)
-		oo.method=XDOC_OUTPUT_METHOD_OPTION_VALUE_XML;
-
-	if(strcmp(oo.method, XDOC_OUTPUT_METHOD_OPTION_VALUE_XML)==0) {
-		if(oo.mediaType.empty())
-			oo.mediaType.append("text/xml");
-		return std::auto_ptr<FormatterListener>(new FormatterToXML(writer,
-			oo.version,  
-			oo.doIndent,
-			XDOC_OUTPUT_DEFAULT_INDENT, // indent 
-			oo.encoding,
-			oo.mediaType,
-			oo.doctypeSystem,
-			oo.doctypePublic,
-			oo.xmlDecl,
-			oo.standalone
-		));
-	} else if(strcmp(oo.method, XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML)==0) {
-		if(oo.mediaType.empty())
-			oo.mediaType.append("text/html");
-		return std::auto_ptr<FormatterListener>(new FormatterToHTML(writer,
-			oo.encoding,
-			oo.mediaType,
-			oo.doctypeSystem,
-			oo.doctypePublic,
-			oo.doIndent,
-			XDOC_OUTPUT_DEFAULT_INDENT, // indent 
-			oo.version,
-			oo.standalone,
-			oo.xmlDecl
-		));
-	} else if(strcmp(oo.method, XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT)==0) {
-		if(oo.mediaType.empty())
-			oo.mediaType.append("text/plain");
-		return std::auto_ptr<FormatterListener>(new FormatterToText(writer,
-			oo.encoding
-		));
-	} else
-		throw Exception(0, 0,
-			&method_name,
-			XDOC_OUTPUT_METHOD_OPTION_NAME " option is invalid; valid methods are: "
-				"'" XDOC_OUTPUT_METHOD_OPTION_VALUE_XML "', "
-				"'" XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML "', "
-				"'" XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT "'");			
-
-	// never reached
-}
-*/
-
-static void _save(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
-
-	const String& file_name=params->as_string(0, "file name must be string");
-	const String& filespec=r.absolute(file_name);
-	
-	GdomeException exc;
-	if(!gdome_di_saveDocToFile(domimpl,
-		vdoc.get_document(&method_name),
-		filespec.cstr(String::UL_FILE_SPEC),
-		GDOME_SAVE_LIBXML_INDENT /*GDOME_SAVE_STANDARD */,
-		&exc))
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
+		oo.method=new(pool) String(pool, XDOC_OUTPUT_METHOD_OPTION_VALUE_XML);
+	// default mediaType = depending on method
+	if(!oo.mediaType) {
+		if(*oo.method==XDOC_OUTPUT_METHOD_OPTION_VALUE_XML)
+			oo.mediaType=new(pool) String(pool, "text/xml");
+		else if(*oo.method==XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML)
+			oo.mediaType=new(pool) String(pool, "text/html");
+		else // XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT & all others
+			oo.mediaType=new(pool) String(pool, "text/plain");
+	}
 }
 
-static void _string(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+static void xdoc2buf(Pool& pool, VXdoc& vdoc, 
+					 const String& method_name, MethodParams *params, int index,
+					 VXdoc::Output_options& oo,
+					 const String *file_spec,
+					 char **parser_buf, size_t *parser_size) {
+	prepare_output_options(pool, method_name, params, index,
+		oo);
+
+	const char *encoding_cstr=oo.encoding->cstr();
+	xmlCharEncodingHandler *encoder=xmlFindCharEncodingHandler(encoding_cstr);
+	if(!encoder)
+		throw Exception("parser.runtime",
+			&method_name,
+			"encoding '%s' not supported", encoding_cstr);
+	// UTF-8 encoder contains empty input/output converters, 
+	// which is wrong for xmlOutputBufferCreateIO
+	// while zero encoder goes perfectly 
+	if(encoder && strcmp(encoder->name, "UTF-8")==0)
+		encoder=0;
+
+	xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(encoder));
+
+	xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet());
+	if(!stylesheet.get())
+		throw Exception(0,
+			&method_name,
+			"xsltNewStylesheet failed");
 
-	char *mem;
-	GdomeException exc;
-	if(!gdome_di_saveDocToMemory(domimpl,
-		vdoc.get_document(&method_name),
-		&mem,
-		GDOME_SAVE_LIBXML_INDENT /*GDOME_SAVE_STANDARD */,
-		&exc))
-		throw Exception(0, 0, 
+	#define OOS2STYLE(name) \
+		stylesheet->name=oo.name?BAD_CAST g_strdup(pool.transcode(*oo.name)->str):0
+	#define OOE2STYLE(name) \
+		stylesheet->name=oo.name
+
+	OOS2STYLE(method);
+	OOS2STYLE(encoding);
+	OOS2STYLE(mediaType);
+	OOS2STYLE(doctypeSystem);
+	OOS2STYLE(doctypePublic);
+	OOE2STYLE(indent);
+	OOS2STYLE(version);
+	OOE2STYLE(standalone);
+	OOE2STYLE(omitXmlDeclaration);
+
+	xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document(&method_name));
+	if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0) {
+		GdomeException exc=0;
+		throw Exception(
 			&method_name, 
 			exc);
+	}
 
-	// move to pool memory
-	size_t buf_size=strlen(mem);
-	char *buf=(char *)pool.malloc(buf_size);
-	memcpy(buf, mem, buf_size);
-	g_free(mem);
 	// write out result
-	r.write_no_lang(*new(pool) String(pool, buf, buf_size));
+	char *gnome_buf;  size_t gnome_size;
+	if(outputBuffer->conv) {
+		gnome_size=outputBuffer->conv->use;
+		gnome_buf=(char *)outputBuffer->conv->content;
+	} else {
+		gnome_size=outputBuffer->buffer->use;
+		gnome_buf=(char *)outputBuffer->buffer->content;
+	}
+	if(file_spec)
+		file_write(
+					*file_spec,
+					gnome_buf, gnome_size, 
+					true/*as_text*/);
+	else if(*parser_size=gnome_size) {
+		*parser_buf=(char *)pool.malloc(gnome_size);
+		memcpy(*parser_buf, gnome_buf, gnome_size);
+	} else
+		*parser_buf=0;
 }
 
-/// @test remove text/xml const. <output method+mediatype / ^file[method+mediatype
 static void _file(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
-
-	char *mem;
-	GdomeException exc;
-	if(!gdome_di_saveDocToMemory(domimpl,
-		vdoc.get_document(&method_name),
-		&mem,
-		GDOME_SAVE_LIBXML_INDENT /*GDOME_SAVE_STANDARD */,
-		&exc))
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
-
-	// move to pool memory
-	size_t buf_size=strlen(mem);
-	char *buf=(char *)pool.malloc(buf_size);
-	memcpy(buf, mem, buf_size);
-	g_free(mem);
+	VXdoc::Output_options oo(vdoc.output_options);
+	char *buf; size_t buf_size;
+	xdoc2buf(pool, vdoc, method_name, params, 0, 
+		oo,
+		0/*not to file, to memory*/,
+		&buf, &buf_size);
+	// write out result
+	r.write_no_lang(*new(pool) String(pool, buf, buf_size));
 
 	// write out result
 	VFile& vfile=*new(pool) VFile(pool);
-	const String& scontent_type=*new(pool) String(pool, "text/xml");
-	Value *vcontent_type=new(pool) VString(scontent_type);
+	Value *vcontent_type;
 	VHash *vhcontent_type=new(pool) VHash(pool);
-	vhcontent_type->hash(&method_name).put(*value_name, new(pool) VString(scontent_type));
-	const String& scharset=pool.get_source_charset().name();
-	vhcontent_type->hash(&method_name).put(*new(pool) String(pool, "charset"), new(pool) VString(scharset));
+	vhcontent_type->hash(&method_name).put(
+		*value_name, 
+		new(pool) VString(*oo.mediaType));
+	vhcontent_type->hash(&method_name).put(
+		*new(pool) String(pool, "charset"), 
+		new(pool) VString(*oo.encoding));
 	vcontent_type=vhcontent_type;
 	
 	vfile.set(false/*tainted*/, buf, buf_size, 0/*file_name*/, vcontent_type);
 	r.write_no_lang(vfile);
 }
 
-/// @test lang=String::UL_UNSPECIFIED?
-static void add_xslt_param(const Hash::Key& aattribute, Hash::Val *ameaning, 
-						   void *info) {
-	Value *meaning=static_cast<Value *>(ameaning);
-	Pool& pool=meaning->pool();
-	const char **transform_params=(const char **)info;
-	*transform_params++=pool.transcode(aattribute)->str;
-	*transform_params++=pool.transcode(meaning->as_string())->str;
-}
-static void _transform(Request& r, const String& method_name, MethodParams *params) {
-	//_asm int 3;
+static void _save(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
 
-	// params
-	const char **transform_params=0;
-	if(params->size()>1) {
-		Value& vparams=params->as_no_junction(1, "transform parameters must be hash");
-		if(vparams.is_defined())
-			if(Hash *params=vparams.get_hash(&method_name)) {
-				transform_params=
-					(const char **)pool.malloc(sizeof(const char *)*params->size()*2+1);
-				params->for_each(add_xslt_param, transform_params);
-				transform_params[params->size()*2]=0;				
-			} else
-				throw Exception(0, 0,
-					&method_name,
-					"transform parameters parameter must be hash");
-	}
+	const String& file_spec=r.absolute(params->as_string(0, "file name must be string"));
+	
+	VXdoc::Output_options oo(vdoc.output_options);
+	xdoc2buf(pool, vdoc, method_name, params, 1, 
+		oo,
+		&file_spec,
+		0, 0);
+}
+
+static void _string(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc::Output_options oo(vdoc.output_options);
+	char *buf; size_t buf_size;
+	xdoc2buf(pool, vdoc, method_name, params, 0, 
+		oo,
+		0/*not to file, to memory*/,
+		&buf, &buf_size);
+	// write out result
+	r.write_no_lang(*new(pool) String(pool, buf, buf_size));
+}
 
-	// stylesheet
-	const String& stylesheet_filespec=r.absolute(params->as_string(0, "file name must be string"));
-	Stylesheet_connection& connection=stylesheet_manager->get_connection(stylesheet_filespec);
-
-	// transform
-	xsltStylesheet *stylesheet=connection.stylesheet(false/*nocache*/);
-	xmlDoc *document=((Gdome_xml_Document*)vdoc.get_document(&method_name))->n;
-	xsltTransformContext *transformContext=xsltNewTransformContext(stylesheet, document);
+static void add_xslt_param(const Hash::Key& aattribute, Hash::Val *ameaning, 
+						   void *info) {
+	Value *meaning=static_cast<Value *>(ameaning);
+	Pool& pool=meaning->pool();
+	const char ** & current_transform_param=*(const char ***)info;
+	*current_transform_param++=pool.transcode(aattribute)->str;
+	*current_transform_param++=pool.transcode(meaning->as_string())->str;
+}
+static VXdoc& _transform(Pool& pool, const String *doc_source, const String *stylesheet_source, 
+						 VXdoc& vdoc, xsltStylesheetPtr stylesheet, const char **transform_params) {
+	xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document(doc_source));
+	xsltTransformContext_auto_ptr transformContext(
+		xsltNewTransformContext(stylesheet, document));
+	// make params literal
+    if (transformContext->globalVars == NULL) // strangly not initialized by xsltNewTransformContext
+		transformContext->globalVars = xmlHashCreate(20);
+	xsltQuoteUserParams(transformContext.get(), transform_params);
+	// do transform
 	xmlDoc *transformed=xsltApplyStylesheetUser(
 		stylesheet,
 		document,
-		transform_params,
+		0/*already quoted-inserted  transform_params*/,
 		0/*const char *output*/,
 		0/*FILE *profile*/,
-		transformContext);
-	if(!transformed) {
-		// close
-		connection.close();
-		throw Exception(0, 0,
-			&method_name, 
-			"transform failed. TODO: show errors");
+		transformContext.get());
+	if(!transformed || xmlHaveGenericErrors()) {
+		GdomeException exc=0;
+		throw Exception(
+			stylesheet_source, 
+			exc);
 	}
 
-	//gdome_xml_doc_mkref: invalid node type
-	transformed->type=XML_DOCUMENT_NODE; //XML_HTML_DOCUMENT_NODE actuall
+	//gdome_xml_doc_mkref dislikes XML_HTML_DOCUMENT_NODE  type, fixing
+	transformed->type=XML_DOCUMENT_NODE;
 	// constructing result
 	GdomeDocument *gdomeDocument=gdome_xml_doc_mkref(transformed);
 	if(!gdomeDocument)
-		throw Exception(0, 0,
-			&method_name,
+		throw Exception(0,
+			doc_source,
 			"gdome_xml_doc_mkref failed");
 	VXdoc& result=*new(pool) VXdoc(pool, gdomeDocument);
-	// grabbing <output> options
-	/*
-	<xsl:output
-	!method = "xml" | "html" | "text"
-		X| qname-but-not-ncname 
-	!version = nmtoken 
-	!encoding = string 
-	!omit-xml-declaration = "yes" | "no"
-	!standalone = "yes" | "no"
-	!doctype-public = string 
-	!doctype-system = string 
-	cdata-section-elements = qnames 
-	!indent = "yes" | "no"
-	!media-type = string /> 
+	/* grabbing options
+
+		<xsl:output
+		!method = "xml" | "html" | "text"
+			X| qname-but-not-ncname 
+		!version = nmtoken 
+		!encoding = string 
+		!omit-xml-declaration = "yes" | "no"
+		!standalone = "yes" | "no"
+		!doctype-public = string 
+		!doctype-system = string 
+		Xcdata-section-elements = qnames 
+		!indent = "yes" | "no"
+		!media-type = string /> 
 	*/
 	memset(&result.output_options, 0, sizeof(result.output_options));
 	VXdoc::Output_options& oo=result.output_options;
 
-	oo.encoding=&pool.transcode(stylesheet->encoding);
-	oo.mediaType=&pool.transcode(stylesheet->mediaType);
-	oo.doctypeSystem=&pool.transcode(stylesheet->doctypeSystem);
-	oo.doctypePublic=&pool.transcode(stylesheet->doctypePublic);
+	oo.method=stylesheet->method?&pool.transcode(stylesheet->method):0;
+	oo.encoding=stylesheet->encoding?&pool.transcode(stylesheet->encoding):0;
+	oo.mediaType=stylesheet->mediaType?&pool.transcode(stylesheet->mediaType):0;
+	oo.doctypeSystem=stylesheet->doctypeSystem?&pool.transcode(stylesheet->doctypeSystem):0;
+	oo.doctypePublic=stylesheet->doctypePublic?&pool.transcode(stylesheet->doctypePublic):0;
 	oo.indent=stylesheet->indent!=0;
-	oo.version=&pool.transcode(stylesheet->version);
+	oo.version=stylesheet->version?&pool.transcode(stylesheet->version):0;
 	oo.standalone=stylesheet->standalone!=0;
 	oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration!=0;
 
-	xsltFreeTransformContext(transformContext);
-	// close
-	connection.close();
-
-	// exceptions now allowed
-
-	// check method
-	if(oo.method && (
-		*oo.method!=XDOC_OUTPUT_METHOD_OPTION_VALUE_XML
-		|| *oo.method!=XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML
-		|| *oo.method!=XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT))
-		throw Exception(0, 0,
-			&method_name,
-			"unsupported output method specified"); 
+	// return
+	return result;
+}
+static void _transform(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
 
-	// write out result
-	r.write_no_lang(result);
+	// params
+	const char **transform_params=0;
+	if(params->size()>1) {
+		Value& vparams=params->as_no_junction(1, "transform parameters must be hash");
+		if(vparams.is_defined())
+			if(Hash *params=vparams.get_hash(&method_name)) {
+				const char **current_transform_param=transform_params=
+					(const char **)pool.malloc(sizeof(const char *)*(params->size()*2+1));
+				params->for_each(add_xslt_param, &current_transform_param);
+				transform_params[params->size()*2]=0;				
+			} else
+				throw Exception("parser.runtime",
+					&method_name,
+					"transform parameters parameter must be hash");
+	}
 
+	VXdoc *result;
+	Value& vmaybe_xdoc=params->get(0);
+	if(strcmp(vmaybe_xdoc.type(), VXDOC_TYPE)==0) { // stylesheet (xdoc)
+		xmlDoc *document=gdome_xml_doc_get_xmlDoc(
+			static_cast<VXdoc *>(&vmaybe_xdoc)->get_document(&method_name));
+		// 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 Exception(&method_name, exc);
+		}
+		if(!stylesheet_ptr.get())
+			throw Exception("xml",
+				&method_name,
+				"stylesheet failed to compile");
+
+		// transform!
+		result=&_transform(pool, &method_name, &method_name,
+			vdoc, stylesheet_ptr.get(),
+			transform_params);
+	} else { // stylesheet (file name)
+		// 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);
+
+		// load and compile file to stylesheet [or get cached if any]
+		// transform!
+		result=&_transform(pool, &method_name, &stylesheet_filespec,
+			vdoc, connection->stylesheet(false/*nocache*/),
+			transform_params);
+	}
+
+	// write out result
+	r.write_no_lang(*result);
 }
 
 // constructor
 
-MXdoc::MXdoc(Pool& apool) : MXnode(apool) {
-	set_name(*NEW String(pool(), XDOC_CLASS_NAME));
-
-	/// @test how to create empty type html?
-
+/// @test how to create empty type html?
+MXdoc::MXdoc(Pool& apool) : MXnode(apool, XDOC_CLASS_NAME, Xnode_class) {
 	/// DOM1
 
 	// Element createElement(in DOMString tagName) raises(DOMException);
@@ -716,22 +787,23 @@ MXdoc::MXdoc(Pool& apool) : MXnode(apool
 	add_native_method("createAttribute", Method::CT_DYNAMIC, _createAttribute, 1, 1);
 	// EntityReference createEntityReference(in DOMString name) raises(DOMException);
 	add_native_method("createEntityReference", Method::CT_DYNAMIC, _createEntityReference, 1, 1);
-	// NodeList getElementsByTagName(in DOMString tagname);
-	add_native_method("getElementsByTagName", Method::CT_DYNAMIC, _getElementsByTagName, 1, 1);
-	// ^xdoc.getElementsByTagNameNS[namespaceURI;localName] = array of nodes
-	add_native_method("getElementsByTagNameNS", Method::CT_DYNAMIC, _getElementsByTagNameNS, 2, 2);
 
-	/// DOM2(?)
+	/// DOM2
 
 	// ^xdoc.getElementById[elementId]
 	add_native_method("getElementById", Method::CT_DYNAMIC, _getElementById, 1, 1);
 
+    // Node (in Node importedNode, in boolean deep) raises(DOMException)
+	add_native_method("importNode", Method::CT_DYNAMIC, _importNode, 2, 2);
+
 	/// parser
 	
 	// ^xdoc::create{qualifiedName}
-	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 1);	
-	// ^xdoc::set[<some>xml</some>]
-	add_native_method("set", Method::CT_DYNAMIC, _set, 1, 1);
+	// ^xdoc::create[<some>xml</some>]
+	// ^xdoc::create[URI][<some>xml</some>]
+	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 2);	
+	// for backward compatibility with <=v 1.82 2002/01/31 11:51:46 paf
+	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 1);
 
 	// ^xdoc::load[some.xml]
 	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 1);