--- parser3/src/classes/xdoc.C	2003/09/22 07:05:52	1.112
+++ parser3/src/classes/xdoc.C	2007/02/28 19:09:23	1.151
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b xdoc parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -9,15 +9,15 @@
 
 #ifdef XML
 
-static const char* IDENT_XDOC_C="$Date: 2003/09/22 07:05:52 $";
+static const char * const IDENT_XDOC_C="$Date: 2007/02/28 19:09:23 $";
 
-#include "gdome.h"
 #include "libxml/tree.h"
+#include "libxml/HTMLtree.h"
 #include "libxslt/xsltInternals.h"
 #include "libxslt/transform.h"
 #include "libxslt/xsltutils.h"
 #include "libxslt/variables.h"
-
+#include "libxslt/imports.h"
 
 #include "pa_vmethod_frame.h"
 
@@ -26,6 +26,7 @@ static const char* IDENT_XDOC_C="$Date:
 #include "pa_vxdoc.h"
 #include "pa_charset.h"
 #include "pa_vfile.h"
+#include "pa_xml_exception.h"
 #include "xnode.h"
 
 // defines
@@ -41,13 +42,11 @@ static const char* IDENT_XDOC_C="$Date:
 
 class MXdoc: public MXnode {
 public: // VStateless_class
-	Value* create_new_value() { return new VXdoc(0, 0); }
+	Value* create_new_value(Pool&, HashStringValue&) { return new VXdoc(); }
 
 public:
 	MXdoc();
 
-public: // Methoded
-	void configure_admin(Request& r);
 };
 
 // global variable
@@ -157,248 +156,224 @@ private:
 
 // methods
 
-static void writeNode(Request& r, GdomeNode *node, 
-					  GdomeException exc) {
-	if(!node || exc)
-		throw Exception(0, exc);
+static void writeNode(Request& r, VXdoc& xdoc, xmlNode* node) {
+	if(!node)
+		throw Exception("parser.runtime",
+			0,
+			"error creating node"); // OOM, bad name, things like that
 
 	// write out result
-	r.write_no_lang(*new VXnode(&r.charsets, node));
+	r.write_no_lang(xdoc.wrap(*node));
 }
 
+struct IdsIteratorInfo {
+	xmlChar *elementId;
+	xmlNode *element;
+};
+
+/* Hash Scanner function for pa_getElementById */
+extern "C" void // switching to calling convetion of libxml
+idsHashScanner (void *payload, void *data, xmlChar *name) {
+	IdsIteratorInfo *priv = (IdsIteratorInfo *)data;
+
+	if (priv->element == NULL && xmlStrEqual (name, priv->elementId))
+	{
+		xmlNode* parent=((xmlID *)payload)->attr->parent;
+		assert(parent);
+		priv->element=parent;
+	}
+}
+
+static xmlNode*
+pa_getElementById(xmlDoc& xmldoc, xmlChar* elementId) {
+	xmlHashTable *ids = (xmlHashTable *)xmldoc.ids;
+	IdsIteratorInfo iter={elementId, NULL};
+	xmlHashScan(ids, idsHashScanner, &iter);
+	return iter.element;
+}
+
+/*
+static xmlNode *
+pa_importNode (xmlDoc& xmldoc, xmlNode& importedNode, bool deep) {
+	xmlNode *result = NULL;
+
+	switch (importedNode.type) {
+	case XML_ATTRIBUTE_NODE:
+		result = (xmlNode *)xmlCopyProp(xmldoc, (xmlAttr *)importedNode);
+		result.parent=0; // no idea
+		break;
+	case XML_DOCUMENT_FRAG_NODE:
+	case XML_ELEMENT_NODE:
+	case XML_ENTITY_REF_NODE:
+	case XML_PI_NODE:
+	case XML_TEXT_NODE:
+	case XML_CDATA_SECTION_NODE:
+	case XML_COMMENT_NODE:
+		result = xmlCopyNode (importedNode->n, deep);
+		xmlSetTreeDoc (result, priv->n);
+		break;
+	default:
+		*exc = GDOME_NOT_SUPPORTED_ERR;
+	}
+
+	return result;
+}
+*/
+
 // Element createElement(in DOMString tagName) raises(DOMException);
 static void _createElement(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	const String& tagName=params.as_string(0, "tagName must be string");
+	xmlChar* tagName=as_xmlchar(r, params, 0, "tagName must be string");
 
-	GdomeException exc;
-	GdomeNode *node=
-		(GdomeNode *)gdome_doc_createElement(vdoc.get_document(), 
-		r.transcode(tagName).use(),
-		&exc);
-	writeNode(r, node, exc);
+	xmlNode *node=xmlNewDocNode(&xmldoc, NULL, tagName, NULL);
+	writeNode(r, vdoc, node);
 }
 
-// Element createElementNS(in DOMString localName) raises(DOMException);
+// Element createElementNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException);
 static void _createElementNS(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
 	// namespaceURI;localName
-	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
-	const String& localName=params.as_string(1, "localName must be string");
+	xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string");
+	xmlChar* qualifiedName=as_xmlchar(r, params, 1, "qualifiedName must be string");
 
-	GdomeException exc;
-	GdomeNode *node=
-		(GdomeNode *)gdome_doc_createElementNS(vdoc.get_document(), 
-		r.transcode(namespaceURI).use(),
-		r.transcode(localName).use(),
-		&exc);
-	writeNode(r, node, exc);
+	xmlChar* prefix=0;
+	xmlChar* localName=xmlSplitQName2(qualifiedName, &prefix);
+
+	xmlNode *node;
+	if(localName) {
+		xmlNs& ns=pa_xmlMapNs(xmldoc, namespaceURI, prefix);
+		node=xmlNewDocNode(&xmldoc, &ns, localName, NULL);
+	} else
+		node=xmlNewDocNode(&xmldoc, NULL, qualifiedName/*unqualified, actually*/, NULL);
+	writeNode(r, vdoc, node);
 }
 
 // DocumentFragment createDocumentFragment()
 static void _createDocumentFragment(Request& r, MethodParams&) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	GdomeException exc;
-	GdomeNode *node=
-		(GdomeNode *)gdome_doc_createDocumentFragment(
-		vdoc.get_document(),
-		&exc);
-	writeNode(r, node, exc);
+	xmlNode *node=xmlNewDocFragment(&xmldoc);
+	writeNode(r, vdoc, node);
 }
 
 // Text createTextNode(in DOMString data);
 static void _createTextNode(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	const String& data=params.as_string(0, "data must be string");
+	xmlChar* data=as_xmlchar(r, params, 0, "data must be string");
 
-	GdomeException exc;
-	GdomeNode *node=(GdomeNode *)gdome_doc_createTextNode(
-		vdoc.get_document(),
-		r.transcode(data).use(),
-		&exc);
-	writeNode(r, node, exc);
+	xmlNode *node=xmlNewDocText(&xmldoc, data);
+	writeNode(r, vdoc, node);
 }
 
 // Comment createComment(in DOMString data)
 static void _createComment(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 
-	const String& data=params.as_string(0, "data must be string");
+	xmlChar* data=as_xmlchar(r, params, 0, "data must be string");
 
-	GdomeException exc;
-	GdomeNode *node=(GdomeNode *)gdome_doc_createComment(
-		vdoc.get_document(),
-		r.transcode(data).use(),
-		&exc);
-	writeNode(r, node, exc);
+	xmlNode *node=xmlNewComment(data);
+	writeNode(r, vdoc, node);
 }
 
 // CDATASection createCDATASection(in DOMString data) raises(DOMException);
 static void _createCDATASection(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	const String& data=params.as_string(0, "data must be string");
+	xmlChar* data=as_xmlchar(r, params, 0, "data must be string");
 
-	GdomeException exc;
-	GdomeNode *node=(GdomeNode *)gdome_doc_createCDATASection(
-		vdoc.get_document(),
-		r.transcode(data).use(),
-		&exc);
-	writeNode(r, node, exc);
+	xmlNode *node=xmlNewCDataBlock(&xmldoc, data, strlen((const char*)data));
+	writeNode(r, vdoc, node);
 }
 
 // ProcessingInstruction createProcessingInstruction(in DOMString target,in DOMString data) raises(DOMException);
 static void _createProcessingInstruction(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	const String& target=params.as_string(0, "data must be string");
-	const String& data=params.as_string(1, "data must be string");
+	xmlChar* target=as_xmlchar(r, params, 0, "data must be string");
+	xmlChar* data=as_xmlchar(r, params, 1, "data must be string");
 
-	GdomeException exc;
-	GdomeNode *node=(GdomeNode *)gdome_doc_createProcessingInstruction(
-		vdoc.get_document(),
-		r.transcode(target).use(), 
-		r.transcode(data).use(),
-		&exc);
-	writeNode(r, node, exc);
+	xmlNode *node=xmlNewDocPI(&xmldoc, target, data);
+	writeNode(r, vdoc, node);
 }
 
 // Attr createAttribute(in DOMString name) raises(DOMException);
 static void _createAttribute(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	const String& name=params.as_string(0, "name must be string");
+	xmlChar* name=as_xmlchar(r, params, 0, "name must be string");
 
-	GdomeException exc;
-	GdomeNode *node=(GdomeNode *)gdome_doc_createAttribute(
-		vdoc.get_document(),
-		r.transcode(name).use(),
-		&exc);
-	writeNode(r, node, exc);
+	xmlNode *node=(xmlNode*)xmlNewDocProp(&xmldoc, name, 0);
+	writeNode(r, vdoc, node);
 }
 
-// Attr createAttributeNS(in DOMString name) raises(DOMException);
+// Attr createAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException);
 static void _createAttributeNS(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	// namespaceURI;qualifiedName
-	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
-	const String& qualifiedName=params.as_string(1, "name must be string");
-
-	GdomeException exc;
-	GdomeNode *node=(GdomeNode *)gdome_doc_createAttributeNS(
-		vdoc.get_document(),
-		r.transcode(namespaceURI).use(),
-		r.transcode(qualifiedName).use(),
-		&exc);
-	writeNode(r, node, exc);
+	xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string");
+	xmlChar* qualifiedName=as_xmlchar(r, params, 1, "name must be string");
+
+	xmlChar* prefix=0;
+	xmlChar* localName=xmlSplitQName2(qualifiedName, &prefix);
+
+	xmlNode *node;
+	if(localName) {
+		xmlNs& ns=pa_xmlMapNs(xmldoc, namespaceURI, prefix);
+		node=(xmlNode*)xmlNewDocProp(&xmldoc, localName, NULL);
+		xmlSetNs(node, &ns);
+	} else
+		node=(xmlNode*)xmlNewDocProp(&xmldoc, qualifiedName/*unqualified, actually*/, NULL);
+	writeNode(r, vdoc, node);
 }
 
 // EntityReference createEntityReference(in DOMString name) raises(DOMException);
 static void _createEntityReference(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	const String& name=params.as_string(0, "name must be string");
+	xmlChar* name=as_xmlchar(r, params, 0, "name must be string");
 
-	GdomeException exc;
-	GdomeNode *node=(GdomeNode *)gdome_doc_createEntityReference(
-		vdoc.get_document(),
-		r.transcode(name).use(),
-		&exc);
-	writeNode(r, node, exc);
-}
-
-// NodeList getElementsByTagName(in DOMString name);
-static void _getElementsByTagName(Request& r, MethodParams& params) {
-	VXdoc& vdoc=GET_SELF(r, VXdoc);
-
-	const String& name=params.as_string(0, "name must be string");
-
-	VHash& result=*new VHash;
-	GdomeException exc;
-	if(GdomeNodeList *nodes=
-		gdome_doc_getElementsByTagName(
-			vdoc.get_document(), 
-			r.transcode(name).use(), 
-			&exc)) {
-		gulong length=gdome_nl_length(nodes, &exc);
-		for(gulong i=0; i<length; i++)
-			result.hash().put(
-				StringBody::Format(i), 
-				new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc)));
-	} else if(exc)
-		throw Exception(0, exc);
-
-	// write out result
-	r.write_no_lang(result);
+	xmlNode *node=xmlNewReference(&xmldoc, name);
+	writeNode(r, vdoc, node);
 }
 
-static void _getElementsByTagNameNS(Request& r, MethodParams& params) {
-	VXdoc& vdoc=GET_SELF(r, VXdoc);
-
-	// namespaceURI;localName
-	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
-	const String& localName=params.as_string(1, "localName must be string");
-
-	GdomeException exc;
-	VHash& result=*new VHash;
-	if(GdomeNodeList *nodes=
-		gdome_doc_getElementsByTagNameNS(
-			vdoc.get_document(), 
-			r.transcode(namespaceURI).use(),
-			r.transcode(localName).use(),
-			&exc)) {
-		gulong length=gdome_nl_length(nodes, &exc);
-		for(gulong i=0; i<length; i++)
-			result.hash().put(
-				StringBody::Format(i), 
-				new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc)));
-	}
-
-	// write out result
-	r.write_no_lang(result);
-}
 
 static void _getElementById(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
 	// elementId
-	const String& elementId=params.as_string(0, "elementID must be string");
+	xmlChar* elementId=as_xmlchar(r, params, 0, "elementID must be string");
 
-	GdomeException exc;
-	if(GdomeNode *node=(GdomeNode *)gdome_doc_getElementById(
-		vdoc.get_document(),
-		r.transcode(elementId).use(),
-		&exc)) {
+	if(xmlNode *node=pa_getElementById(xmldoc, elementId)) {
 		// write out result
-		r.write_no_lang(*new VXnode(&r.charsets, node));
-	} else if(exc || xmlHaveGenericErrors())
-		throw Exception(
-			&elementId, 
-			exc);
+		writeNode(r, vdoc, node);
+	}
 }
 
 static void _importNode(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	GdomeNode *importedNode=
+	xmlNode& importedNode=
 		as_node(params, 0, "importedNode must be node");
 	bool deep=
 		params.as_bool(1, "deep must be bool", r);
 
-	GdomeException exc;
-	GdomeNode *outputNode=gdome_doc_importNode(vdoc.get_document(), 
-		importedNode,
-		deep, &exc);
-	if(exc)
-		throw Exception(0, exc);
-
+	xmlNode *node=xmlDocCopyNode(&importedNode, &xmldoc, deep?1: 0);
 	// write out result
-	r.write_no_lang(*new VXnode(&r.charsets, outputNode));
+	writeNode(r, vdoc, node);
 }
 /*
 GdomeElement *gdome_doc_createElementNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc);
@@ -410,75 +385,67 @@ static void _create(Request& r, MethodPa
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 
 	Value& param=params[params.count()-1];
-	GdomeDocument *document;
+	xmlDoc* xmldoc;
 	bool set_encoding=false;
 	if(param.get_junction()) { // {<?xml?>...}
 		Temp_lang temp_lang(r, String::L_XML);
 		const String& xml=r.process_to_string(param);
 
-		const char* cstr=xml.cstr(String::L_UNSPECIFIED);
-		document=(GdomeDocument *)
-			gdome_xml_n_mkref((xmlNode *)xmlParseMemory(
-				cstr, strlen(cstr)
-			));
+		const char* cstr=xml.cstr(String::L_UNSPECIFIED, 0, &r.charsets);
+		xmldoc=xmlParseMemory(cstr, strlen(cstr));
 		//printf("document=0x%p\n", document);
-		if(!document || xmlHaveGenericErrors()) {
-			GdomeException exc=0;
-			throw Exception(0, exc);
-		}
+		if(!xmldoc || xmlHaveGenericErrors())
+			throw XmlException(0);
 
 		// must be last action in if, see after if}
-	} else { // [name]
-		const String& qualifiedName=param.as_string();
-
-		GdomeException exc;
-		/*
+	} else { // [localName]
+		if (VFile* vfile=param.as_vfile(String::L_UNSPECIFIED)){
+			xmldoc=xmlParseMemory(vfile->value_ptr(), vfile->value_size());
+			if(!xmldoc || xmlHaveGenericErrors())
+				throw XmlException(0);
+		} else {
+			xmlChar* localName=r.transcode(param.as_string());
+#if 0
 		GdomeDocumentType *documentType=gdome_di_createDocumentType (
 			docimpl, 
 			r.transcode(qualifiedName), 
-			0/*publicId* /, 
-			0/*systemId* /, 
+			0/*publicId*/, 
+			0/*systemId*/, 
 			&exc);
 		if(!documentType || exc || xmlHaveGenericErrors())
 			throw Exception(
 				method_name, 
 				exc);
 		/// +xalan createXMLDecl ?
-		*/
-		document=gdome_di_createDocument (domimpl, 
-			0/*namespaceURI*/, 
-			r.transcode(qualifiedName).use(), 
-			0/*doctype*/, 
-			&exc);
-		if(!document || exc || xmlHaveGenericErrors())
-			throw Exception(0, exc);
+#endif
+			xmldoc=xmlNewDoc(0);
+			if(!xmldoc || xmlHaveGenericErrors())
+				throw XmlException(0);
+			xmlNode* node=xmlNewChild((xmlNode*)xmldoc, NULL, localName, NULL);
+			if(!node || xmlHaveGenericErrors())
+				throw XmlException(0);
 
-		set_encoding=true;
-		// must be last action in if, see after if}
+			set_encoding=true;
+			// must be last action in if, see after if}
+		}
 	}
 	// must be first action after if}
 	// replace any previous parsed source
-	{
-		vdoc.set_document(&r.charsets, document); 
-		GdomeException exc;
-		gdome_doc_unref(document, &exc);
-	}
+	vdoc.set_xmldoc(r.charsets, *xmldoc); 
 	
 	// URI 
 	const char* URI_cstr;
-	const char* URI_cstr_ptr;
 	if(params.count()>1) { // absolute(param)
 		const String& URI=params.as_string(0, "URI must be string");
-		URI_cstr=URI_cstr_ptr=r.absolute(URI).cstr();
+		URI_cstr=r.absolute(URI).cstr();
 	} else // default = disk path to requested document
 		URI_cstr=r.request_info.path_translated;
-	xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document);
 	if(URI_cstr)
-		doc->URL=source_charset.transcode_buf2xchar(URI_cstr, strlen(URI_cstr));
+		xmldoc->URL=source_charset.transcode_buf2xchar(URI_cstr, strlen(URI_cstr));
 
 	if(set_encoding) {
 		const char* source_charset_name=source_charset.NAME().cstr();
-		doc->encoding=source_charset.transcode_buf2xchar(source_charset_name, strlen(source_charset_name));
+		xmldoc->encoding=source_charset.transcode_buf2xchar(source_charset_name, strlen(source_charset_name));
 	}
 }
 
@@ -486,50 +453,38 @@ static void _load(Request& r, MethodPara
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 
 	// filespec
-	const String& file_name=params.as_string(0, "uri must be string");
-	const String& uri=r.absolute(file_name);
-
-	File_read_result file=file_read(r.charsets, uri, false/*not text*/,
-		params.count()>1?params.as_no_junction(1, "additional params must be hash")
-			.get_hash()
-			:0);
-
-	GdomeDocument *document=(GdomeDocument *)
-		gdome_xml_n_mkref((xmlNode *)xmlParseMemory(file.str, file.length));
-	if(!document || xmlHaveGenericErrors()) {
-		GdomeException exc=0;
-		throw Exception(&uri, exc);
-	}
+	const String* uri=&params.as_string(0, "uri must be string");
+	const char* uri_cstr;
+	if(uri->pos("://")==STRING_NOT_FOUND) // disk path
+		uri_cstr=r.absolute(*uri).cstr(String::L_FILE_SPEC);
+	else // xxx:// 
+		uri_cstr=uri->cstr(String::L_AS_IS); // leave as-is for xmlParseFile to handle
+
+	/// todo!! add SAFE MODE!!
+	xmlDoc* xmldoc=xmlParseFile(uri_cstr);
+	if(!xmldoc || xmlHaveGenericErrors())
+		throw XmlException(uri);
+	
 	// must be first action after if}
 	// replace any previous parsed source
-	{
-		vdoc.set_document(&r.charsets, document); 
-		GdomeException exc;
-		gdome_doc_unref(document, &exc);
-	}
-
-	const char* URI_cstr=uri.cstr();
-	xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document);
-	if(URI_cstr)
-		doc->URL=r.charsets.source().transcode_buf2xchar(URI_cstr, strlen(URI_cstr));
-
+	vdoc.set_xmldoc(r.charsets, *xmldoc); 
 }
 
 static void param_option_over_output_option(
 					    HashStringValue& param_options, const char* option_name,
 					    const String*& output_option) {
-	if(Value* value=param_options.get(StringBody(option_name)))
+	if(Value* value=param_options.get(String::Body(option_name)))
 		output_option=&value->as_string();
 }
 static void param_option_over_output_option(
 					    HashStringValue& param_options, const char* option_name,
-					    bool& output_option) {
-	if(Value* value=param_options.get(StringBody(option_name))) {
+					    int& output_option) {
+	if(Value* value=param_options.get(String::Body(option_name))) {
 		const String& s=value->as_string();
 		if(s=="yes")
-			output_option=true;
+			output_option=1;
 		else if(s=="no")
-			output_option=false;
+			output_option=0;
 		else
 			throw Exception("parser.runtime",
 				&s,
@@ -561,7 +516,7 @@ static void prepare_output_options(Reque
 		if(voptions.is_defined()) {
 			if(HashStringValue *options=voptions.get_hash()) {
 				// $.method[xml|html|text]
-				if(Value* vmethod=options->get(StringBody(XDOC_OUTPUT_METHOD_OPTION_NAME)))
+				if(Value* vmethod=options->get(String::Body(XDOC_OUTPUT_METHOD_OPTION_NAME)))
 					oo.method=&vmethod->as_string();
 
 				// $.version[1.0]
@@ -572,10 +527,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}]
@@ -608,24 +559,33 @@ struct Xdoc2buf_result {
 static Xdoc2buf_result xdoc2buf(Request& r, VXdoc& vdoc, 
 					 MethodParams& params, int index,
 					 VXdoc::Output_options& oo,
-					 const String* file_spec) {
+					 const String* file_spec,
+					 bool use_source_charset_to_render_and_client_charset_to_write_to_header=false) {
 	Xdoc2buf_result result;
 	prepare_output_options(r, params, index,
 		oo);
 
-	const char* encoding_cstr=oo.encoding->cstr();
-	xmlCharEncodingHandler *encoder=xmlFindCharEncodingHandler(encoding_cstr);
-	if(!encoder)
+	const char* render_encoding;
+	const char* header_encoding;
+	if(use_source_charset_to_render_and_client_charset_to_write_to_header) {
+		render_encoding=r.charsets.source().NAME_CSTR();
+		header_encoding=r.charsets.client().NAME_CSTR();
+	} else {
+		header_encoding=render_encoding=oo.encoding->cstr();
+	}
+
+	xmlCharEncodingHandler *renderer=xmlFindCharEncodingHandler(render_encoding);
+	if(!renderer)
 		throw Exception("parser.runtime",
 			0,
-			"encoding '%s' not supported", encoding_cstr);
-	// UTF-8 encoder contains empty input/output converters, 
+			"encoding '%s' not supported", render_encoding);
+	// UTF-8 renderer 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;
+	// while zero renderer goes perfectly 
+	if(strcmp(render_encoding, "UTF-8")==0)
+		renderer=0;
 
-	xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(encoder));
+	xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(renderer));
 
 	xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet());
 	if(!stylesheet.get())
@@ -633,26 +593,28 @@ static Xdoc2buf_result xdoc2buf(Request&
 			0,
 			"xsltNewStylesheet failed");
 
-	#define OOS2STYLE(name) \
-		stylesheet->name=oo.name?BAD_CAST xmlMemStrdup(r.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());
-	if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0) {
-		GdomeException exc=0;
-		throw Exception(0, exc);
-	}
+	#define OOSTRING2STYLE(name) \
+		stylesheet->name=oo.name?BAD_CAST xmlMemStrdup((const char*)r.transcode(*oo.name)):0
+	#define OOBOOL2STYLE(name) \
+		if(oo.name>=0) stylesheet->name=oo.name
+
+	OOSTRING2STYLE(method);
+	OOSTRING2STYLE(encoding);
+	OOSTRING2STYLE(mediaType);
+//	OOSTRING2STYLE(doctypeSystem);
+//	OOSTRING2STYLE(doctypePublic);
+	OOBOOL2STYLE(indent);
+	OOSTRING2STYLE(version);
+	OOBOOL2STYLE(standalone);
+	OOBOOL2STYLE(omitXmlDeclaration);
+
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
+	xmldoc.encoding=BAD_CAST xmlMemStrdup(render_encoding);
+	if(header_encoding)
+		stylesheet->encoding=BAD_CAST xmlMemStrdup(header_encoding);
+	if(xsltSaveResultTo(outputBuffer.get(), &xmldoc, stylesheet.get())<0
+		|| xmlHaveGenericErrors())
+		throw XmlException(0);
 
 	// write out result
 	char *gnome_str;  size_t gnome_length;
@@ -664,14 +626,15 @@ static Xdoc2buf_result xdoc2buf(Request&
 		gnome_str=(char *)outputBuffer->buffer->content;
 	}
 
+	if((result.length=gnome_length)) {
+		result.str=pa_strdup(gnome_str, gnome_length);
+	} else
+		result.str=0;
+
 	if(file_spec)
 		file_write(*file_spec,
 			gnome_str, gnome_length, 
 			true/*as_text*/);
-	else if(result.length=gnome_length) {
-		result.str=pa_strdup(gnome_str, gnome_length);
-	} else
-		result.str=0;
 
 	return result;
 }
@@ -692,7 +655,7 @@ static void _file(Request& r, MethodPara
 		value_name, 
 		new VString(*oo.mediaType));
 	vhcontent_type.hash().put(
-		StringBody("charset"), 
+		String::Body("charset"), 
 		new VString(*oo.encoding));
 
 	vfile.set(false/*tainted*/, buf.str?buf.str:""/*to distinguish from stat-ed file*/, buf.length, 
@@ -716,57 +679,54 @@ static void _string(Request& r, MethodPa
 	VXdoc::Output_options oo(vdoc.output_options);
 	Xdoc2buf_result buf=xdoc2buf(r, vdoc, params, 0, 
 		oo,
-		0/*not to file, to memory*/);
+		0/*not to file, to memory*/,
+		true/*use source charset to render, client charset to put to header*/);
 	// write out result
-	r.write_no_lang(String(buf.str, buf.length));
+	r.write_no_lang(String(String::Body(buf.str), String::L_AS_IS));
 }
 
 #ifndef DOXYGEN
 struct Add_xslt_param_info {
 	Request* r;
-	Array<GdomeDOMString_auto_ptr>* strings;
-	const char** current_transform_param;
+	Array<const xmlChar*>* strings;
+	const xmlChar** current_transform_param;
 };
 #endif
 static void add_xslt_param(
 			   HashStringValue::key_type attribute, 
 			   HashStringValue::value_type meaning, 
 			   Add_xslt_param_info* info) {
-	GdomeDOMString_auto_ptr s;
-	*info->current_transform_param++=(s=info->r->transcode(attribute))->str; *info->strings+=s;
-	*info->current_transform_param++=(s=info->r->transcode(meaning->as_string()))->str; *info->strings+=s;
+	xmlChar* s;
+	*info->current_transform_param++=(s=info->r->transcode(attribute)); *info->strings+=s;
+	*info->current_transform_param++=(s=info->r->transcode(meaning->as_string())); *info->strings+=s;
 }
+
 static VXdoc& _transform(Request& r, const String* stylesheet_source, 
-						   VXdoc& vdoc, xsltStylesheetPtr stylesheet, const char** transform_params) {
-	xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document());
+						   VXdoc& vdoc, xsltStylesheetPtr stylesheet, const xmlChar** transform_params) 
+{
+	xmlDoc& xmldoc=vdoc.get_xmldoc();
+
 	xsltTransformContext_auto_ptr transformContext(
-		xsltNewTransformContext(stylesheet, document));
+		xsltNewTransformContext(stylesheet, &xmldoc));
 	// make params literal
 	if (transformContext->globalVars == NULL) // strangly not initialized by xsltNewTransformContext
 		transformContext->globalVars = xmlHashCreate(20);
-	xsltQuoteUserParams(transformContext.get(), transform_params);
+	xsltQuoteUserParams(transformContext.get(), (const char**)transform_params);
 	// do transform
 	xmlDoc *transformed=xsltApplyStylesheetUser(
 		stylesheet,
-		document,
+		&xmldoc,
 		0/*already quoted-inserted  transform_params*/,
 		0/*const char* output*/,
 		0/*FILE *profile*/,
 		transformContext.get());
-	if(!transformed || xmlHaveGenericErrors()) {
-		GdomeException exc=0;
-		throw Exception(stylesheet_source, exc);
-	}
+	if(!transformed || xmlHaveGenericErrors())
+		throw XmlException(stylesheet_source);
 
 	//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,
-			"gdome_xml_doc_mkref failed");
-	VXdoc& result=*new VXdoc(&r.charsets, gdomeDocument);
+	VXdoc& result=*new VXdoc(r.charsets, *transformed);
 	/* grabbing options
 
 		<xsl:output
@@ -787,12 +747,10 @@ 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.indent=stylesheet->indent;
 	oo.version=stylesheet->version?&r.transcode(stylesheet->version):0;
-	oo.standalone=stylesheet->standalone!=0;
-	oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration!=0;
+	oo.standalone=stylesheet->standalone;
+	oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration;
 
 	// return
 	return result;
@@ -801,19 +759,19 @@ static void _transform(Request& r, Metho
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 
 	// params
-	Array<GdomeDOMString_auto_ptr> transform_strings;
-	const char** transform_params=0;
+	Array<const xmlChar*> transform_strings;
+	const xmlChar** transform_params=0;
 	if(params.count()>1) {
 		Value& vparams=params.as_no_junction(1, "transform parameters must be hash");
 		if(!vparams.is_string())
 			if(HashStringValue* hash=vparams.get_hash()) {
-				transform_params=new(UseGC) const char*[hash->count()*2+1];
+				transform_params=new(UseGC) const xmlChar*[hash->count()*2+1];
 				Add_xslt_param_info info={
 					&r, 
 					&transform_strings,
 					transform_params
 				};
-				hash->for_each(add_xslt_param, &info);
+				hash->for_each<Add_xslt_param_info*>(add_xslt_param, &info);
 				transform_params[hash->count()*2]=0;				
 			} else
 				throw Exception("parser.runtime",
@@ -823,21 +781,18 @@ static void _transform(Request& r, Metho
 
 	VXdoc* result;
 	if(Value *vxdoc=params[0].as(VXDOC_TYPE, false)) { // stylesheet (xdoc)
-		xmlDoc *document=gdome_xml_doc_get_xmlDoc(
-			static_cast<VXdoc *>(vxdoc)->get_document());
+		xmlDoc& stylesheetdoc=static_cast<VXdoc *>(vxdoc)->get_xmldoc();
 		// 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(0, exc);
-		}
+		xsltStylesheet_auto_ptr stylesheet_ptr(xsltParseStylesheetDoc(&stylesheetdoc)); 
+		if(xmlHaveGenericErrors())
+			throw XmlException(0);
 		if(!stylesheet_ptr.get())
 			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,
@@ -847,12 +802,11 @@ 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!
-		result=&_transform(r, &stylesheet_filespec,
-			vdoc, connection->stylesheet(false/*nocache*/),
+		result=&_transform(r, &stylesheet_filespec, vdoc, connection->stylesheet(),
 			transform_params);
 	}
 
@@ -882,8 +836,6 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME,
 	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 name);
-	add_native_method("getElementsByTagName", Method::CT_DYNAMIC, _getElementsByTagName, 1, 1);
 
 	/// DOM2
 
@@ -893,15 +845,12 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME,
     // Node (in Node importedNode, in boolean deep) raises(DOMException)
 	add_native_method("importNode", Method::CT_DYNAMIC, _importNode, 2, 2);
 
-	// Attr createAttributeNS(in DOMString name) raises(DOMException);
+	// Attr createAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException);
 	add_native_method("createAttributeNS", Method::CT_DYNAMIC, _createAttributeNS, 2, 2);
 
-	// Element createElementNS(in DOMString tagName) raises(DOMException);
+	// Element createElementNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException);
 	add_native_method("createElementNS", Method::CT_DYNAMIC, _createElementNS, 2, 2);
 
-	// NodeList getElementsByTagNameNS(in DOMString namespaceURI, in DOMString localName);
-	add_native_method("getElementsByTagNameNS", Method::CT_DYNAMIC, _getElementsByTagNameNS, 2, 2);
-
 	/// parser
 	
 	// ^xdoc::create{qualifiedName}
@@ -912,7 +861,7 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME,
 	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 1);
 
 	// ^xdoc::load[some.xml]
-	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);
+	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 1);
 
 	// ^xdoc.save[some.xml]
 	// ^xdoc.save[some.xml;options hash]
@@ -932,9 +881,6 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME,
 
 }
 
-void MXdoc::configure_admin(Request& r) {
-}
-
 # else
 
 #include "classes.h"
@@ -944,4 +890,3 @@ void MXdoc::configure_admin(Request& r)
 DECLARE_CLASS_VAR(xdoc, 0, 0); // fictive
 
 #endif
-