--- parser3/src/classes/xnode.C	2002/01/11 12:24:27	1.22
+++ parser3/src/classes/xnode.C	2005/08/09 08:14:48	1.71
@@ -1,33 +1,37 @@
 /** @file
 	Parser: @b dom parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: xnode.C,v 1.22 2002/01/11 12:24:27 paf Exp $
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 #include "classes.h"
 #ifdef XML
 
+static const char * const IDENT_XNODE_C="$Date: 2005/08/09 08:14:48 $";
+
+#include "pa_vmethod_frame.h"
+
 #include "pa_charset.h"
 #include "pa_request.h"
 #include "pa_vxnode.h"
+#include "pa_vxdoc.h"
+#include "pa_vvoid.h"
+#include "pa_xml_exception.h"
 
 #include "xnode.h"
-
-extern "C" {
-#include "gdomecore/gdome-xml-node.h"
-};
-#include "gdomecore/gdome-xml-document.h"
-#include "gdome.h"
 #include "libxml/xpath.h"
+#include "libxml/xpathInternals.h"
+
+// global variable
+
+DECLARE_CLASS_VAR(xnode, new MXnode, 0);
 
 // classes
 
 class xmlXPathObject_auto_ptr {
 public:
-	explicit xmlXPathObject_auto_ptr(xmlXPathObject *_P = 0) 
-		: _Owns(_P != 0), _Ptr(_P) {}
+	explicit xmlXPathObject_auto_ptr(xmlXPathObject *_APtr = 0) 
+		: _Owns(_APtr != 0), _Ptr(_APtr) {}
 	xmlXPathObject_auto_ptr(const xmlXPathObject_auto_ptr& _Y) 
 		: _Owns(_Y._Owns), _Ptr(_Y.release()) {}
 	xmlXPathObject_auto_ptr& operator=(const xmlXPathObject_auto_ptr& _Y) 
@@ -59,8 +63,8 @@ private:
 
 class xmlXPathContext_auto_ptr {
 public:
-	explicit xmlXPathContext_auto_ptr(xmlXPathContext *_P = 0) 
-		: _Owns(_P != 0), _Ptr(_P) {}
+	explicit xmlXPathContext_auto_ptr(xmlXPathContext *_APtr = 0) 
+		: _Owns(_APtr != 0), _Ptr(_APtr) {}
 	xmlXPathContext_auto_ptr(const xmlXPathContext_auto_ptr& _Y) 
 		: _Owns(_Y._Owns), _Ptr(_Y.release()) {}
 	xmlXPathContext_auto_ptr& operator=(const xmlXPathContext_auto_ptr& _Y) 
@@ -90,33 +94,32 @@ private:
 	xmlXPathContext *_Ptr;
 };
 
-// defines
-
-#define XNODE_CLASS_NAME "xnode"
-
 // helpers
 
-GdomeNode *as_node(Pool& pool, const String& method_name, MethodParams *params, 
-						int index, const char *msg) {
-	Value& value=params->as_no_junction(index, msg);
-	if(strcmp(value.type(), VXNODE_TYPE)!=0)
-		throw Exception(0, 0,
-			&method_name,
+GdomeNode* as_node(MethodParams& params, 
+		   int index, const char* msg) {
+	GdomeNode* result;
+	Value& value=params.as_no_junction(index, msg);
+	if(Value* vxnode=value.as(VXNODE_TYPE, false))
+		result=static_cast<VXnode*>(vxnode)->get_node();
+	else {
+		throw Exception("parser.runtime",
+			0,
 			msg);
+	}
 
-	VXnode& vnode=*static_cast<VXnode *>(&value);
-	return vnode.get_node(&method_name);
+	return result;
 }
 
 // helpers
 
-GdomeAttr * as_attr(Pool& pool, const String& method_name, MethodParams *params, 
-						int index, const char *msg) {
-	GdomeNode *node=as_node(pool, method_name, params, index, msg);
+GdomeAttr* as_attr(MethodParams& params, 
+		   int index, const char* msg) {
+	GdomeNode* node=as_node(params, index, msg);
 	GdomeException exc;
 	if(gdome_n_nodeType(node, &exc)!=GDOME_ATTRIBUTE_NODE)
-		throw Exception(0, 0, 
-			&method_name,
+		throw Exception("parser.runtime",
+			0,
 			msg);
 
 	return GDOME_A(node);
@@ -127,351 +130,582 @@ GdomeAttr * as_attr(Pool& pool, const St
 // DOM1 node
 
 // Node insertBefore(in Node newChild,in Node refChild) raises(DOMException);
-static void _insertBefore(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
-	GdomeNode *selfNode=vnode.get_node(&method_name);
-	GdomeNode *newChild=as_node(pool, method_name, params, 0, "newChild must be node");
-	GdomeNode *refChild=as_node(pool, method_name, params, 1, "refChild must be node");
+static void _insertBefore(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeNode* selfNode=vnode.get_node();
+	GdomeNode* newChild=as_node(params, 0, "newChild must be node");
+	GdomeNode* refChild=as_node(params, 1, "refChild must be node");
 	
 	GdomeException exc;
-	if(GdomeNode *retNode=gdome_n_insertBefore(selfNode, newChild, refChild, &exc)) {
+	if(GdomeNode* retNode=gdome_n_insertBefore(selfNode, newChild, refChild, &exc)) {
 		// write out result
-		VXnode& result=*new(pool) VXnode(pool, retNode);
-		r.write_no_lang(result);		
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode));
 	} else
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
+		throw XmlException(0, exc);
 }
 
 // Node replaceChild(in Node newChild,in Node oldChild) raises(DOMException);
-static void _replaceChild(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
-	GdomeNode *selfNode=vnode.get_node(&method_name);
-	GdomeNode *newChild=as_node(pool, method_name, params, 0, "newChild must be node");
-	GdomeNode *refChild=as_node(pool, method_name, params, 1, "refChild must be node");
+static void _replaceChild(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeNode* selfNode=vnode.get_node();
+	GdomeNode* newChild=as_node(params, 0, "newChild must be node");
+	GdomeNode* oldChild=as_node(params, 1, "oldChild must be node");
 	
 	GdomeException exc;
-	if(GdomeNode *retNode=gdome_n_replaceChild(selfNode, newChild, refChild, &exc)) {
+	if(GdomeNode* retNode=gdome_n_replaceChild(selfNode, newChild, oldChild, &exc)) {
 		// write out result
-		r.write_no_lang(*new(pool) VXnode(pool, retNode));		
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode));
 	} else
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
+		throw XmlException(0, exc);
 }
 
 // Node removeChild(in Node oldChild) raises(DOMException);
-static void _removeChild(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
-	GdomeNode *selfNode=vnode.get_node(&method_name);
-	GdomeNode *oldChild=as_node(pool, method_name, params, 0, "oldChild must be node");
+static void _removeChild(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeNode* selfNode=vnode.get_node();
+	GdomeNode* oldChild=as_node(params, 0, "oldChild must be node");
 	
 	GdomeException exc;
-	if(GdomeNode *retNode=gdome_n_removeChild(selfNode, oldChild, &exc)) {
+	if(GdomeNode* retNode=gdome_n_removeChild(selfNode, oldChild, &exc)) {
 		// write out result
-		r.write_no_lang(*new(pool) VXnode(pool, retNode));
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode));
 	} else
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
+		throw XmlException(0, exc);
 }
 
 // Node appendChild(in Node newChild) raises(DOMException);
-static void _appendChild(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
-	GdomeNode *selfNode=vnode.get_node(&method_name);
-	GdomeNode *newChild=as_node(pool, method_name, params, 0, "newChild must be node");
+static void _appendChild(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeNode* selfNode=vnode.get_node();
+	GdomeNode* newChild=as_node(params, 0, "newChild must be node");
 	
 	GdomeException exc;
-	if(GdomeNode *retNode=gdome_n_appendChild(selfNode, newChild, &exc)) {
+	if(GdomeNode* retNode=gdome_n_appendChild(selfNode, newChild, &exc)) {
 		// write out result
-		r.write_no_lang(*new(pool) VXnode(pool, retNode));		
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode));
 	}  else
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
+		throw XmlException(0, exc);
 }
 
 // boolean hasChildNodes();
-static void _hasChildNodes(Request& r, const String& method_name, MethodParams *) {
-	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
-	GdomeNode *node=vnode.get_node(&method_name);
+static void _hasChildNodes(Request& r, MethodParams&) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeNode* node=vnode.get_node();
 
 	GdomeException exc;
 	// write out result
-	VBool& result=*new(pool) VBool(pool, gdome_n_hasChildNodes(node, &exc)!=0);
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	bool result=gdome_n_hasChildNodes(node, &exc)!=0;
+	r.write_no_lang(*new VBool(result));
 }
 
 // Node cloneNode(in boolean deep);
-/// @test ownerDocument=?
-static void _cloneNode(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
-	GdomeNode *node=vnode.get_node(&method_name);
+static void _cloneNode(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeNode* node=vnode.get_node();
 
-	bool deep=params->as_bool(0, "deep must be bool", r);
+	bool deep=params.as_bool(0, "deep must be bool", r);
 
 	GdomeException exc;
 	// write out result
-	VXnode& result=*new(pool) VXnode(pool, gdome_n_cloneNode(node, deep, &exc));
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), gdome_n_cloneNode(node, deep, &exc)));
 }
 
 // DOM1 element
 
-GdomeElement *get_self_element(Request& r, const String& method_name) {
-	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
-	GdomeNode *node=vnode.get_node(&method_name);
+GdomeElement* get_self_element(VXnode& vnode) {
+	GdomeNode* node=vnode.get_node();
 
 	GdomeException exc;
 	if(gdome_n_nodeType(node, &exc)!=GDOME_ELEMENT_NODE)
-		throw Exception(0, 0, 
-			&method_name,
-			"method can be called on node of ELEMENT type");
+		throw Exception("parser.runtime",
+			0,
+			"method can only be called on nodes of ELEMENT type");
 
 	return GDOME_EL(node);
 }
 
-// DOMString getAttribute(in DOMString name);
-static void _getAttribute(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	GdomeElement *element=get_self_element(r, method_name);
-	const String& name=params->as_string(0, "name must be string");
+
+
+/// @bug attribute_value must be freed!  [// DOMString getAttribute(in DOMString name);
+static void _getAttribute(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+	const String& name=params.as_string(0, "name must be string");
 
 	GdomeException exc;
 	GdomeDOMString *attribute_value=
-		gdome_el_getAttribute(element, pool.transcode(name).get(), &exc);
+		gdome_el_getAttribute(element, r.transcode(name).use(), &exc);
 	// write out result
-	r.write_no_lang(*new(pool) VString(pool.transcode(attribute_value)));
+	r.write_pass_lang(r.transcode(attribute_value));
 }
 
 // void setAttribute(in DOMString name, in DOMString value) raises(DOMException);
-static void _setAttribute(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	GdomeElement *element=get_self_element(r, method_name);
-	const String& name=params->as_string(0, "name must be string");
-	const String& attribute_value=params->as_string(1, "value must be string");
+static void _setAttribute(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+	const String& name=params.as_string(0, "name must be string");
+	const String& attribute_value=params.as_string(1, "value must be string");
 
 	GdomeException exc;
 	gdome_el_setAttribute(element,
-		pool.transcode(name).get(), 
-		pool.transcode(attribute_value).get(),
+		r.transcode(name).use(), 
+		r.transcode(attribute_value).use(),
 		&exc);
 	if(exc)
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
+		throw XmlException(0, exc);
 }
 
 // void removeAttribute(in DOMString name) raises(DOMException);
-static void _removeAttribute(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	GdomeElement *element=get_self_element(r, method_name);
-	const String& name=params->as_string(0, "name must be string");
+static void _removeAttribute(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+	const String& name=params.as_string(0, "name must be string");
 
 	GdomeException exc;
-	gdome_el_removeAttribute(element, pool.transcode(name).get(), &exc);
+	gdome_el_removeAttribute(element, r.transcode(name).use(), &exc);
 	if(exc)
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
+		throw XmlException(0, exc);
 }
 
 // Attr getAttributeNode(in DOMString name);
-static void _getAttributeNode(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	GdomeElement *element=get_self_element(r, method_name);
-	const String& name=params->as_string(0, "name must be string");
+static void _getAttributeNode(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+	const String& name=params.as_string(0, "name must be string");
 
 	GdomeException exc;
-	if(GdomeAttr *attr=gdome_el_getAttributeNode(element, pool.transcode(name).get(), &exc)) {
+	if(GdomeAttr *attr=gdome_el_getAttributeNode(element, 
+		r.transcode(name).use(), &exc)) {
 		// write out result
-		VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)attr);
-		r.write_no_lang(result);
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), (GdomeNode* )attr));
 	} else if(exc)
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
+		throw XmlException(0, exc);
 }	
 
 // Attr setAttributeNode(in Attr newAttr) raises(DOMException);
-static void _setAttributeNode(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	GdomeElement *element=get_self_element(r, method_name);
-	GdomeAttr * newAttr=as_attr(pool, method_name, params, 0, "newAttr must be ATTRIBUTE node");
+static void _setAttributeNode(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+	GdomeAttr * newAttr=as_attr(params, 0, "newAttr must be ATTRIBUTE node");
 
 	GdomeException exc;
 	if(GdomeAttr *returnAttr=gdome_el_setAttributeNode(element, newAttr, &exc)) {
 		// write out result
-		VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)returnAttr);
-		r.write_no_lang(result);
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), (GdomeNode* )returnAttr));
 	} else
-		throw Exception(0, 0, 
-			&method_name, 
-			exc);
+		throw XmlException(0, exc);
 }	
 
 // Attr removeAttributeNode(in Attr oldAttr) raises(DOMException);
-static void _removeAttributeNode(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	GdomeElement *element=get_self_element(r, method_name);
-	GdomeAttr * oldAttr=as_attr(pool, method_name, params, 0, "oldAttr must be ATTRIBUTE node");
+static void _removeAttributeNode(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+	GdomeAttr * oldAttr=as_attr(params, 0, "oldAttr must be ATTRIBUTE node");
 
 	GdomeException exc;
 	gdome_el_removeAttributeNode(element, oldAttr, &exc);
 	if(exc)
-		throw Exception(0, 0, 
-		&method_name, 
-		exc);
+		throw XmlException(0, exc);
 }	
 
 // NodeList getElementsByTagName(in DOMString name);
-static void _getElementsByTagName(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	GdomeElement *element=get_self_element(r, method_name);
+static void _getElementsByTagName(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
 
-	const String& name=params->as_string(0, "name must be string");
+	const String& name=params.as_string(0, "name must be string");
 
-	VHash& result=*new(pool) VHash(pool);
+	VHash& result=*new VHash;
 	GdomeException exc;
 	if(GdomeNodeList *nodes=
-		gdome_el_getElementsByTagName(element, pool.transcode(name).get(), &exc)) {
+		gdome_el_getElementsByTagName(element, r.transcode(name).use(), &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)));
-		}
+		for(gulong i=0; i<length; i++)
+			result.hash().put(
+				String::Body::Format(i), 
+				new VXnode(&r.charsets, vnode.get_xdoc(), gdome_nl_item(nodes, i, &exc)));
 	} else if(exc)
-		throw Exception(0, 0, 
-		&method_name, 
-		exc);
+		throw XmlException(0, exc);
 
 	// write out result
 	r.write_no_lang(result);
 }
 
-// void normalize();
-static void _normalize(Request& r, const String& method_name, MethodParams *) {
-	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
-	GdomeNode *selfNode=vnode.get_node(&method_name);
+// DOM 2
+
+// DOMString getAttributeNS(in DOMString namespaceURI, in DOMString localName);
+static void _getAttributeNS(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+	
+	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
+	const String& localName=params.as_string(0, "localName must be string");
 
 	GdomeException exc;
-	gdome_n_normalize(selfNode, &exc);
+	GdomeDOMString *attribute_value=
+		gdome_el_getAttributeNS(element, 
+			r.transcode(namespaceURI).use(),
+			r.transcode(localName).use(), &exc);
+	// write out result
+	r.write_pass_lang(r.transcode(attribute_value));
+}
+
+// void setAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName, in DOMString value) raises(DOMException);
+static void _setAttributeNS(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
+	const String& qualifiedName=params.as_string(1, "qualifiedName must be string");
+	const String& attribute_value=params.as_string(2, "value must be string");
+
+	GdomeException exc;
+	gdome_el_setAttributeNS(element,
+		r.transcode(namespaceURI).use(),
+		r.transcode(qualifiedName).use(), 
+		r.transcode(attribute_value).use(),
+		&exc);
 	if(exc)
-		throw Exception(0, 0, 
-		&method_name, 
-		exc);
-}
-/*
-static void _select(Request& r, const String& method_name, MethodParams *params) {
-//	_asm int 3;
-	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
+		throw XmlException(0, exc);
+}
 
-	// expression
-	const String& expression=params->as_string(0, "expression must be string");
-	const char *expression_cstr=expression.cstr();
-	XalanDOMString dstring(expression_cstr);
-	const XalanDOMChar *expression_dcstr=dstring.c_str();
-
-	XPathEvaluator evaluator;
-	// We'll use these to parse the XML file.
-	XalanSourceTreeDOMSupport dom_support;
-
-	try {
-		NodeRefList list=evaluator.selectNodeList(dom_support, 
-			&vnode.get_node(&method_name), 
-			expression_dcstr);
-
-		VHash& result=*new(pool) VHash(pool);
-		for(int i=0; i<list.getLength(); i++) {
-			String& skey=*new(pool) String(pool);
-			{
-				char *buf=(char *)pool.malloc(MAX_NUMBER);
-				snprintf(buf, MAX_NUMBER, "%d", i);
-				skey << buf;
-			}
+// void removeAttributeNS(in DOMString namespaceURI, in DOMString localName) raises(DOMException);
+static void _removeAttributeNS(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
+	const String& localName=params.as_string(1, "localName must be string");
 
-			result.hash(0).put(skey, new(pool) VXnode(pool, list.item(i), false));
-		}
-		result.set_name(method_name);
-		r.write_no_lang(result);
-	} catch(const XSLException& e) {
-		Exception::provide_source(pool, &expression, e);
+	GdomeException exc;
+	gdome_el_removeAttributeNS(element, 
+	r.transcode(namespaceURI).use(),
+	r.transcode(localName).use(), 
+	&exc);
+	if(exc)
+		throw XmlException(0, exc);
+}
+
+// Attr getAttributeNodeNS(in DOMString namespaceURI, in DOMString localName);
+static void _getAttributeNodeNS(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
+	const String& name=params.as_string(1, "name must be string");
+
+	GdomeException exc;
+	if(GdomeAttr *attr=gdome_el_getAttributeNodeNS(element, 
+		r.transcode(namespaceURI).use(), r.transcode(name).use(), &exc)) {
+		// write out result
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), (GdomeNode* )attr));
+	} else if(exc)
+		throw XmlException(0, exc);
+}
+
+// Attr setAttributeNodeNS(in Attr newAttr) raises(DOMException);
+static void _setAttributeNodeNS(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+	GdomeAttr * newAttr=as_attr(params, 0, "newAttr must be ATTRIBUTE node");
+
+	GdomeException exc;
+	if(GdomeAttr *returnAttr=gdome_el_setAttributeNodeNS(element, newAttr, &exc)) {
+		// write out result
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), (GdomeNode* )returnAttr));
+	} else
+		throw XmlException(0, exc);
+}
+
+// boolean hasAttribute(in DOMString name) raises(DOMException);
+static void _hasAttribute(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+
+	const String& name=params.as_string(0, "name must be string");
+
+	GdomeException exc;
+	// write out result
+	bool result=gdome_el_hasAttribute(element, 
+	r.transcode(name).use(),
+	&exc)!=0;
+	r.write_no_lang(*new VBool(result));
+}
+
+// boolean hasAttributeNS(n DOMString namespaceURI, in DOMString localName) raises(DOMException);
+static void _hasAttributeNS(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+
+	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
+	const String& localName=params.as_string(1, "localName must be string");
+
+	GdomeException exc;
+	// write out result
+	bool result=gdome_el_hasAttributeNS(element, 
+	r.transcode(namespaceURI).use(),
+	r.transcode(localName).use(),
+	&exc)!=0;
+	r.write_no_lang(*new VBool(result));
+}
+
+static void _getElementsByTagNameNS(Request& r, MethodParams& params) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
+
+	// 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_el_getElementsByTagNameNS(
+			element, 
+			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(
+				String::Body::Format(i), 
+				new VXnode(&r.charsets, vnode.get_xdoc(), gdome_nl_item(nodes, i, &exc)));
 	}
+
+	// write out result
+	r.write_no_lang(result);
 }
-*/
-static void _selectSingle(Request& r, const String& method_name, MethodParams *params) {
-//	_asm int 3;
-	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
 
-	// expression
-	const String& expression=params->as_string(0, "expression must be string");
+// void normalize();
+static void _normalize(Request& r, MethodParams&) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeNode* selfNode=vnode.get_node();
+
+	GdomeException exc;
+	gdome_n_normalize(selfNode, &exc);
+	if(exc)
+		throw XmlException(0, exc);
+}
+
+#ifndef DOXYGEN
+struct Register_one_ns_info {
+	Request* r;
+	xmlXPathContextPtr ctxt;
+};
+#endif
+static void register_one_ns(
+								  HashStringValue::key_type key, 
+								  HashStringValue::value_type value, 
+								  Register_one_ns_info* info) {
+	if(const String* svalue=value->get_string())
+		xmlXPathRegisterNs(info->ctxt, 
+			BAD_CAST info->r->transcode(key)->str, 
+			BAD_CAST info->r->transcode(*svalue)->str);
+	else
+		throw Exception("parser.runtime",
+			new String(key, String::L_TAINTED),
+			"value is %s, must be string or number", value->type());
+}
+static void _selectX(Request& r, MethodParams& params,
+					 void (*handler)(Request& r,
+							  const String& expression, 
+							  xmlXPathObject_auto_ptr res,
+							  VXdoc& xdoc,
+							  Value*& result)) {
+	VXnode& vnode=GET_SELF(r, VXnode);
 
+	// expression
+	const String& expression=params.as_string(0, "expression must be string");
 	GdomeException exc;
-	GdomeNode *dome_node=vnode.get_node(&method_name);
+	GdomeNode* dome_node=vnode.get_node();
 	GdomeDocument *dome_document=gdome_n_ownerDocument(dome_node, &exc);
-	if(!dome_document)
-		dome_document=GDOME_DOC(dome_node);
-	xmlDoc *xml_document=((_Gdome_xml_Document *)dome_document)->n;
-    xmlXPathContext_auto_ptr ctxt(xmlXPathNewContext(xml_document));
-	ctxt->node=xmlDocGetRootElement(xml_document);
+	if(!dome_document) // document does not own itself, so ownerDocument = 0
+		dome_document=GDOME_DOC(dome_node); // and we need downcast
+	xmlDoc *xml_document=gdome_xml_doc_get_xmlDoc(dome_document);
+	xmlXPathContext_auto_ptr ctxt(xmlXPathNewContext(xml_document));
+	{
+		Register_one_ns_info info={&r, ctxt.get()};
+		vnode.get_xdoc().search_namespaces.hash().for_each(register_one_ns, &info);
+	}
+	ctxt->node=gdome_xml_n_get_xmlNode(dome_node);
 	/*error to stderr for now*/
 	xmlXPathObject_auto_ptr res(
-		xmlXPathEvalExpression(BAD_CAST pool.transcode(expression)->str, ctxt.get()));
+		xmlXPathEvalExpression(BAD_CAST r.transcode(expression)->str, ctxt.get()));
+
+	if(xmlHaveGenericErrors()) {
+		GdomeException exc=0;
+		throw XmlException(&expression, exc);
+	}
 
+	Value* result=0;
    	if(res.get())
-		switch(res->type) {
-		case XPATH_UNDEFINED: break;
-		case XPATH_NODESET: 
-			{
-				if(res->nodesetval->nodeNr>1)
-					throw Exception(0, 0,
+		handler(r, expression, res, vnode.get_xdoc(), result);
+	if(result)
+		r.write_no_lang(*result);
+}
+
+static void selectNodesHandler(Request& r,
+			       const String& expression,
+			       xmlXPathObject_auto_ptr res,
+				   VXdoc& xdoc,
+			       Value*& result) {
+	VHash& vhash=*new VHash;  result=&vhash;
+	switch(res->type) {
+	case XPATH_UNDEFINED: 
+		break;
+	case XPATH_NODESET:
+		if(res->nodesetval)
+			if(int size=res->nodesetval->nodeNr) {
+				HashStringValue& hash=vhash.hash();
+				for(int i=0; i<size; i++)
+					hash.put(
+						String::Body::Format(i), 
+						new VXnode(
+							&r.charsets, 
+							xdoc,
+							gdome_xml_n_mkref(res->nodesetval->nodeTab[i])));
+			}
+		break;
+	default: 
+		throw Exception(0,
+			&expression,
+			"wrong xmlXPathEvalExpression result type (%d)", res->type);
+		break; // never
+	}
+}
+
+static void selectNodeHandler(Request& r,
+			      const String& expression,
+				  xmlXPathObject_auto_ptr res,
+				  VXdoc& xdoc,
+				  Value*& result) {
+	switch(res->type) {
+	case XPATH_UNDEFINED: 
+		break;
+	case XPATH_NODESET: 
+		if(res->nodesetval && res->nodesetval->nodeNr) { // empty result strangly has NODESET  res->type
+			if(res->nodesetval->nodeNr>1)
+				throw Exception("parser.runtime",
 					&expression,
 					"resulted not in a single node (%d)", res->nodesetval->nodeNr);
-				
-				VXnode& result=*new(pool) VXnode(
-					pool, 
-					gdome_xml_n_mkref(res->nodesetval->nodeTab[0]));
-				result.set_name(method_name);
-				r.write_no_lang(result);
-				break;
-			}
-		//case XPATH_BOOLEAN: nothing; break;
-		//case XPATH_NUMBER: nothing; break;
-		//case XPATH_STRING: nothing; break;
-		default: 
-			throw Exception(0, 0,
-				&expression,
-				"unrecognized xmlXPathEvalExpression result type (%d)", res->type);
-			break; // never
+			
+			result=new VXnode(
+				&r.charsets, 
+				xdoc,
+				gdome_xml_n_mkref(res->nodesetval->nodeTab[0]));
 		}
+		break;
+	case XPATH_BOOLEAN: 
+		result=new VBool(res->boolval!=0);
+		break;
+	case XPATH_NUMBER: 
+		result=new VDouble(res->floatval);
+		break;
+	case XPATH_STRING:
+		result=new VString(r.transcode((xmlChar*)res->stringval));
+		break;
+	default: 
+		throw Exception("parser.runtime",
+			&expression,
+			"wrong xmlXPathEvalExpression result type (%d)", res->type);
+		// result=0;
+		break; // never
+	}
 }
 
-// constructor
+static void selectBoolHandler(Request&,
+			      const String& expression,
+			      xmlXPathObject_auto_ptr res,
+				  VXdoc& /*xdoc*/,
+			      Value*& result) {
+	switch(res->type) {
+	case XPATH_BOOLEAN: 
+		result=new VBool(res->boolval!=0);
+		break;
+	case XPATH_NODESET: 
+		if(!(res->nodesetval && res->nodesetval->nodeNr))
+			break;
+		// else[nodeset] fall down to default
+	default: 
+		throw Exception("parser.runtime",
+			&expression,
+			"wrong xmlXPathEvalExpression result type (%d)", res->type);
+		break; // never
+	}
+}
+
+static void selectNumberHandler(Request&,
+				const String& expression,
+				xmlXPathObject_auto_ptr res,
+				VXdoc& /*xdoc*/,
+				Value*& result) {
+	switch(res->type) {
+	case XPATH_NUMBER: 
+		result=new VDouble(res->floatval);
+		break;
+	case XPATH_NODESET:
+		if(!(res->nodesetval && res->nodesetval->nodeNr))
+			break;
+		// else[nodeset] fall down to default
+	default: 
+		throw Exception("parser.runtime",
+			&expression,
+			"wrong xmlXPathEvalExpression result type (%d)", res->type);
+		break; // never
+	}
+}
+
+static void selectStringHandler(Request& r,
+							  const String& expression,
+							  xmlXPathObject_auto_ptr res,
+							  VXdoc& /*xdoc*/,
+							  Value*& result) {
+	switch(res->type) {
+	case XPATH_UNDEFINED: 
+		break;
+	case XPATH_STRING:
+		result=new VString(r.transcode((xmlChar*)res->stringval));
+		break;
+	case XPATH_NODESET: 
+		if(!(res->nodesetval && res->nodesetval->nodeNr))
+			break;
+		// else[nodeset] fall down to default
+	default: 
+		throw Exception("parser.runtime",
+			&expression,
+			"wrong xmlXPathEvalExpression result type (%d)", res->type);
+		break; // never
+	}
+}
 
-MXnode::MXnode(Pool& apool) : Methoded(apool), 
-	consts(apool) {
-	set_name(*NEW String(pool(), XNODE_CLASS_NAME));
+static void _select(Request& r, MethodParams& params) {
+	_selectX(r, params,
+		selectNodesHandler);
+}
+
+static void _selectSingle(Request& r, MethodParams& params) {
+	_selectX(r, params,
+		selectNodeHandler);
+}
+
+static void _selectBool(Request& r, MethodParams& params) {
+	_selectX(r, params,
+		selectBoolHandler);
+}
+
+static void _selectNumber(Request& r, MethodParams& params) {
+	_selectX(r, params,
+		selectNumberHandler);
+}
 
+static void _selectString(Request& r, MethodParams& params) {
+	_selectX(r, params,
+		selectStringHandler);
+}
+
+// constructor
+
+/// @bug one can change const and ruin other's work, we need unchangable VIntConst class
+MXnode::MXnode(const char* aname, VStateless_class *abase):
+	Methoded(aname?aname:"xnode", abase)
+{
 	/// DOM1 node
 
 	// Node insertBefore(in Node newChild,in Node refChild) raises(DOMException);
@@ -503,49 +737,64 @@ MXnode::MXnode(Pool& apool) : Methoded(a
 	add_native_method("removeAttributeNode", Method::CT_DYNAMIC, _removeAttributeNode, 1, 1);
 	// NodeList getElementsByTagName(in DOMString name);
 	add_native_method("getElementsByTagName", Method::CT_DYNAMIC, _getElementsByTagName, 1, 1);
+	// NodeList getElementsByTagNameNS(in DOMString namespaceURI, in DOMString localName);
+	add_native_method("getElementsByTagNameNS", Method::CT_DYNAMIC, _getElementsByTagNameNS, 2, 2);
 	// void normalize();
 	add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0);
 
+	/// DOM2 element
+
+	// DOMString getAttributeNS(in DOMString namespaceURI, in DOMString localName);
+	add_native_method("getAttributeNS", Method::CT_DYNAMIC, _getAttributeNS, 2, 2);
+	// void setAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName, in DOMString value) raises(DOMException);
+	add_native_method("setAttributeNS", Method::CT_DYNAMIC, _setAttributeNS, 3, 3);
+	// void removeAttributeNS(in DOMString namespaceURI, in DOMString localName) raises(DOMException);
+	add_native_method("removeAttributeNS", Method::CT_DYNAMIC, _removeAttributeNS, 2, 2);
+	// Attr getAttributeNodeNS(in DOMString namespaceURI, in DOMString localName);
+	add_native_method("getAttributeNodeNS", Method::CT_DYNAMIC, _getAttributeNodeNS, 2, 2);
+	// Attr setAttributeNodeNS(in Attr newAttr) raises(DOMException);
+	add_native_method("setAttributeNodeNS", Method::CT_DYNAMIC, _setAttributeNodeNS, 1, 1);
+	// boolean hasAttribute(in DOMString name) raises(DOMException);
+	add_native_method("hasAttribute", Method::CT_DYNAMIC, _hasAttribute, 1, 1);
+	// boolean hasAttributeNS(in DOMString namespaceURI, in DOMString localName) raises(DOMException);
+	add_native_method("hasAttributeNS", Method::CT_DYNAMIC, _hasAttributeNS, 2, 2);
+
 	/// parser
 	// ^node.select[/some/xpath/query] = hash $.#[dnode]
-//	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1);
+	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1);
 
-	// ^node.selectSingle[/some/xpath/query] = first dnode
+	// ^node.selectSingle[/some/xpath/query] = first node [if any]
 	add_native_method("selectSingle", Method::CT_DYNAMIC, _selectSingle, 1, 1);
+	// ^node.selectBool[/some/xpath/query] = bool value [if any]
+	add_native_method("selectBool", Method::CT_DYNAMIC, _selectBool, 1, 1);
+	// ^node.selectNumber[/some/xpath/query] = double value [if any]
+	add_native_method("selectNumber", Method::CT_DYNAMIC, _selectNumber, 1, 1);
+	// ^node.selectString[/some/xpath/query] = strinv value [if any]
+	add_native_method("selectString", Method::CT_DYNAMIC, _selectString, 1, 1);
 
 	// consts
 
 #define CONST(name) \
-	consts.put(*new(pool()) String(pool(), #name), new(pool()) VInt(pool(), GDOME_##name))
+	consts.put(String::Body(#name), new VInt(GDOME_##name))
 
 	CONST(ELEMENT_NODE);
-    CONST(ATTRIBUTE_NODE);
-    CONST(TEXT_NODE);
-    CONST(CDATA_SECTION_NODE);
-    CONST(ENTITY_REFERENCE_NODE);
-    CONST(ENTITY_NODE);
-    CONST(PROCESSING_INSTRUCTION_NODE);
-    CONST(COMMENT_NODE);
-    CONST(DOCUMENT_NODE);
-    CONST(DOCUMENT_TYPE_NODE);
-    CONST(DOCUMENT_FRAGMENT_NODE);
-    CONST(NOTATION_NODE);
-
+	CONST(ATTRIBUTE_NODE);
+	CONST(TEXT_NODE);
+	CONST(CDATA_SECTION_NODE);
+	CONST(ENTITY_REFERENCE_NODE);
+	CONST(ENTITY_NODE);
+	CONST(PROCESSING_INSTRUCTION_NODE);
+	CONST(COMMENT_NODE);
+	CONST(DOCUMENT_NODE);
+	CONST(DOCUMENT_TYPE_NODE);
+	CONST(DOCUMENT_FRAGMENT_NODE);
+	CONST(NOTATION_NODE);
 }
 
+#else
+
 // global variable
 
-Methoded *Xnode_class;
+DECLARE_CLASS_VAR(xnode, 0, 0); // fictive
 
 #endif
-
-// creator
-Methoded *MXnode_create(Pool& pool) {
-	return 
-#ifdef XML
-		Xnode_class=new(pool) MXnode(pool)
-#else
-		0
-#endif
-		;
-}