--- parser3/src/classes/xnode.C	2002/08/15 09:07:49	1.48
+++ parser3/src/classes/xnode.C	2002/10/15 15:12:57	1.53
@@ -7,7 +7,7 @@
 #include "classes.h"
 #ifdef XML
 
-static const char* IDENT_XNODE_C="$Date: 2002/08/15 09:07:49 $";
+static const char* IDENT_XNODE_C="$Date: 2002/10/15 15:12:57 $";
 
 #include "pa_charset.h"
 #include "pa_request.h"
@@ -126,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");
@@ -145,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");
@@ -163,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");
 	
@@ -180,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");
 	
@@ -197,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;
@@ -209,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);
@@ -223,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);
 }
@@ -245,7 +245,7 @@ static void _getAttribute(Request& r, co
 	GdomeDOMString *attribute_value=
 		gdome_el_getAttribute(element, pool.transcode(name).get(), &exc);
 	// write out result
-	r.write_no_lang(pool.transcode(attribute_value));
+	r.write_no_lang(pool.transcode(attribute_value, &name));
 }
 
 // void setAttribute(in DOMString name, in DOMString value) raises(DOMException);
@@ -395,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;
@@ -413,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");
@@ -502,7 +502,7 @@ static void selectNodeHandler(Pool& pool
 		result=new(pool) VString(
 			pool.transcode(
 				GdomeDOMString_auto_ptr(
-					gdome_str_mkref_dup((const gchar *)res->stringval)).get()));
+					gdome_str_mkref_dup((const gchar *)res->stringval)).get(), &expression));
 		break;
 	default: 
 		throw Exception("parser.runtime",
@@ -563,7 +563,7 @@ static void selectStringHandler(Pool& po
 		result=new(pool) VString(
 			pool.transcode(
 				GdomeDOMString_auto_ptr(
-					gdome_str_mkref_dup((const gchar *)res->stringval)).get()));
+					gdome_str_mkref_dup((const gchar *)res->stringval)).get(), &expression));
 		break;
 	case XPATH_NODESET: 
 		if(!(res->nodesetval && res->nodesetval->nodeNr))