--- parser3/src/classes/xnode.C	2002/04/18 15:54:39	1.45
+++ parser3/src/classes/xnode.C	2002/09/18 08:52:50	1.52
@@ -3,12 +3,12 @@
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: xnode.C,v 1.45 2002/04/18 15:54:39 paf Exp $
 */
 #include "classes.h"
 #ifdef XML
 
+static const char* IDENT_XNODE_C="$Date: 2002/09/18 08:52:50 $";
+
 #include "pa_charset.h"
 #include "pa_request.h"
 #include "pa_vxnode.h"
@@ -97,14 +97,12 @@ private:
 GdomeNode *as_node(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 
-		|| strcmp(value.type(), VXDOC_TYPE)==0))
+	if(Value *vxnode=value.as(VXNODE_TYPE, false))
+		return static_cast<VXnode *>(vxnode)->get_node(&method_name);
+	else
 		throw Exception("parser.runtime",
 			&method_name,
 			msg);
-
-	VXnode& vnode=*static_cast<VXnode *>(&value);
-	return vnode.get_node(&method_name);
 }
 
 // helpers
@@ -128,7 +126,7 @@ GdomeAttr * as_attr(Pool& pool, const St
 // 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);
+	VXnode& vnode=*static_cast<VXnode *>(r.get_self());
 	GdomeNode *selfNode=vnode.get_node(&method_name);
 	GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node");
 	GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node");
@@ -147,7 +145,7 @@ static void _insertBefore(Request& r, co
 // 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);
+	VXnode& vnode=*static_cast<VXnode *>(r.get_self());
 	GdomeNode *selfNode=vnode.get_node(&method_name);
 	GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node");
 	GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node");
@@ -165,7 +163,7 @@ static void _replaceChild(Request& r, co
 // 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);
+	VXnode& vnode=*static_cast<VXnode *>(r.get_self());
 	GdomeNode *selfNode=vnode.get_node(&method_name);
 	GdomeNode *oldChild=as_node(method_name, params, 0, "oldChild must be node");
 	
@@ -182,7 +180,7 @@ static void _removeChild(Request& r, con
 // 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);
+	VXnode& vnode=*static_cast<VXnode *>(r.get_self());
 	GdomeNode *selfNode=vnode.get_node(&method_name);
 	GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node");
 	
@@ -199,7 +197,7 @@ static void _appendChild(Request& r, con
 // boolean hasChildNodes();
 static void _hasChildNodes(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
+	VXnode& vnode=*static_cast<VXnode *>(r.get_self());
 	GdomeNode *node=vnode.get_node(&method_name);
 
 	GdomeException exc;
@@ -211,7 +209,7 @@ static void _hasChildNodes(Request& r, c
 // Node cloneNode(in boolean deep);
 static void _cloneNode(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
+	VXnode& vnode=*static_cast<VXnode *>(r.get_self());
 	GdomeNode *node=vnode.get_node(&method_name);
 
 	bool deep=params->as_bool(0, "deep must be bool", r);
@@ -225,14 +223,14 @@ static void _cloneNode(Request& r, const
 
 GdomeElement *get_self_element(Request& r, const String& method_name) {
 	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
+	VXnode& vnode=*static_cast<VXnode *>(r.get_self());
 	GdomeNode *node=vnode.get_node(&method_name);
 
 	GdomeException exc;
 	if(gdome_n_nodeType(node, &exc)!=GDOME_ELEMENT_NODE)
 		throw Exception("parser.runtime",
 			&method_name,
-			"method can be called on node of ELEMENT type");
+			"method can only be called on nodes of ELEMENT type");
 
 	return GDOME_EL(node);
 }
@@ -397,7 +395,7 @@ static void _getElementsByTagNameNS(Requ
 // void normalize();
 static void _normalize(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
+	VXnode& vnode=*static_cast<VXnode *>(r.get_self());
 	GdomeNode *selfNode=vnode.get_node(&method_name);
 
 	GdomeException exc;
@@ -415,7 +413,7 @@ static void _selectX(Request& r, const S
 							  Value *& result)) {
 //	_asm int 3;
 	Pool& pool=r.pool();
-	VXnode& vnode=*static_cast<VXnode *>(r.self);
+	VXnode& vnode=*static_cast<VXnode *>(r.get_self());
 
 	// expression
 	const String& expression=params->as_string(0, "expression must be string");