--- parser3/src/classes/xnode.C	2002/09/18 08:52:50	1.52
+++ parser3/src/classes/xnode.C	2003/01/21 15:51:08	1.54
@@ -1,13 +1,13 @@
 /** @file
 	Parser: @b dom parser class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 #include "classes.h"
 #ifdef XML
 
-static const char* IDENT_XNODE_C="$Date: 2002/09/18 08:52:50 $";
+static const char* IDENT_XNODE_C="$Date: 2003/01/21 15:51:08 $";
 
 #include "pa_charset.h"
 #include "pa_request.h"
@@ -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);
@@ -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))