--- parser3/src/classes/xnode.C	2003/11/20 16:34:24	1.63
+++ parser3/src/classes/xnode.C	2004/10/21 06:37:50	1.68
@@ -1,13 +1,13 @@
 /** @file
 	Parser: @b dom parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 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: 2003/11/20 16:34:24 $";
+static const char * const IDENT_XNODE_C="$Date: 2004/10/21 06:37:50 $";
 
 #include "pa_vmethod_frame.h"
 
@@ -26,6 +26,7 @@ extern "C" {
 };
 #include "gdome.h"
 #include "libxml/xpath.h"
+#include "libxml/xpathInternals.h"
 
 // global variable
 
@@ -144,7 +145,7 @@ static void _insertBefore(Request& r, Me
 	GdomeException exc;
 	if(GdomeNode* retNode=gdome_n_insertBefore(selfNode, newChild, refChild, &exc)) {
 		// write out result
-		r.write_no_lang(*new VXnode(&r.charsets, retNode));
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode));
 	} else
 		throw XmlException(0, exc);
 }
@@ -159,7 +160,7 @@ static void _replaceChild(Request& r, Me
 	GdomeException exc;
 	if(GdomeNode* retNode=gdome_n_replaceChild(selfNode, newChild, oldChild, &exc)) {
 		// write out result
-		r.write_no_lang(*new VXnode(&r.charsets, retNode));
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode));
 	} else
 		throw XmlException(0, exc);
 }
@@ -173,7 +174,7 @@ static void _removeChild(Request& r, Met
 	GdomeException exc;
 	if(GdomeNode* retNode=gdome_n_removeChild(selfNode, oldChild, &exc)) {
 		// write out result
-		r.write_no_lang(*new VXnode(&r.charsets, retNode));
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode));
 	} else
 		throw XmlException(0, exc);
 }
@@ -187,7 +188,7 @@ static void _appendChild(Request& r, Met
 	GdomeException exc;
 	if(GdomeNode* retNode=gdome_n_appendChild(selfNode, newChild, &exc)) {
 		// write out result
-		r.write_no_lang(*new VXnode(&r.charsets, retNode));		
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode));
 	}  else
 		throw XmlException(0, exc);
 }
@@ -212,13 +213,12 @@ static void _cloneNode(Request& r, Metho
 
 	GdomeException exc;
 	// write out result
-	r.write_no_lang(*new VXnode(&r.charsets, gdome_n_cloneNode(node, deep, &exc)));
+	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) {
-	VXnode& vnode=GET_SELF(r, VXnode);
+GdomeElement* get_self_element(VXnode& vnode) {
 	GdomeNode* node=vnode.get_node();
 
 	GdomeException exc;
@@ -232,21 +232,23 @@ GdomeElement* get_self_element(Request&
 
 
 
-// DOMString getAttribute(in DOMString name);
+/// @bug attribute_value must be freed!  [// DOMString getAttribute(in DOMString name);
 static void _getAttribute(Request& r, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	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, r.transcode(name).use(), &exc);
 	// write out result
-	r.write_no_lang(r.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, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	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");
 
@@ -261,7 +263,8 @@ static void _setAttribute(Request& r, Me
 
 // void removeAttribute(in DOMString name) raises(DOMException);
 static void _removeAttribute(Request& r, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	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;
@@ -272,34 +275,37 @@ static void _removeAttribute(Request& r,
 
 // Attr getAttributeNode(in DOMString name);
 static void _getAttributeNode(Request& r, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	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, 
 		r.transcode(name).use(), &exc)) {
 		// write out result
-		r.write_no_lang(*new VXnode(&r.charsets, (GdomeNode* )attr));
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), (GdomeNode* )attr));
 	} else if(exc)
 		throw XmlException(0, exc);
 }	
 
 // Attr setAttributeNode(in Attr newAttr) raises(DOMException);
 static void _setAttributeNode(Request& r, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	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
-		r.write_no_lang(*new VXnode(&r.charsets, (GdomeNode* )returnAttr));
+		r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), (GdomeNode* )returnAttr));
 	} else
 		throw XmlException(0, exc);
 }	
 
 // Attr removeAttributeNode(in Attr oldAttr) raises(DOMException);
 static void _removeAttributeNode(Request& r, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	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;
@@ -310,7 +316,8 @@ static void _removeAttributeNode(Request
 
 // NodeList getElementsByTagName(in DOMString name);
 static void _getElementsByTagName(Request& r, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
 
 	const String& name=params.as_string(0, "name must be string");
 
@@ -322,7 +329,7 @@ static void _getElementsByTagName(Reques
 		for(gulong i=0; i<length; i++)
 			result.hash().put(
 				String::Body::Format(i), 
-				new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc)));
+				new VXnode(&r.charsets, vnode.get_xdoc(), gdome_nl_item(nodes, i, &exc)));
 	} else if(exc)
 		throw XmlException(0, exc);
 
@@ -334,7 +341,8 @@ static void _getElementsByTagName(Reques
 
 // DOMString getAttributeNS(in DOMString namespaceURI, in DOMString localName);
 static void _getAttributeNS(Request& r, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	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");
@@ -345,12 +353,13 @@ static void _getAttributeNS(Request& r,
 			r.transcode(namespaceURI).use(),
 			r.transcode(localName).use(), &exc);
 	// write out result
-	r.write_no_lang(r.transcode(attribute_value));
+	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) {
-	GdomeElement* element=get_self_element(r);
+	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");
@@ -367,7 +376,8 @@ static void _setAttributeNS(Request& r,
 
 // void removeAttributeNS(in DOMString namespaceURI, in DOMString localName) raises(DOMException);
 static void _removeAttributeNS(Request& r, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	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");
 
@@ -382,7 +392,8 @@ static void _removeAttributeNS(Request&
 
 // Attr getAttributeNodeNS(in DOMString namespaceURI, in DOMString localName);
 static void _getAttributeNodeNS(Request& r, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	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");
 
@@ -390,27 +401,29 @@ static void _getAttributeNodeNS(Request&
 	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, (GdomeNode* )attr));
+		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) {
-	GdomeElement* element=get_self_element(r);
+	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, (GdomeNode* )returnAttr));
+		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) {
-	GdomeElement* element=get_self_element(r);
+	VXnode& vnode=GET_SELF(r, VXnode);
+	GdomeElement* element=get_self_element(vnode);
 
 	const String& name=params.as_string(0, "name must be string");
 
@@ -424,7 +437,8 @@ static void _hasAttribute(Request& r, Me
 
 // boolean hasAttributeNS(n DOMString namespaceURI, in DOMString localName) raises(DOMException);
 static void _hasAttributeNS(Request& r, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	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");
@@ -439,7 +453,8 @@ static void _hasAttributeNS(Request& r,
 }
 
 static void _getElementsByTagNameNS(Request& r, MethodParams& params) {
-	GdomeElement* element=get_self_element(r);
+	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");
@@ -457,7 +472,7 @@ static void _getElementsByTagNameNS(Requ
 		for(gulong i=0; i<length; i++)
 			result.hash().put(
 				String::Body::Format(i), 
-				new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc)));
+				new VXnode(&r.charsets, vnode.get_xdoc(), gdome_nl_item(nodes, i, &exc)));
 	}
 
 	// write out result
@@ -475,16 +490,35 @@ static void _normalize(Request& r, Metho
 		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();
 	GdomeDocument *dome_document=gdome_n_ownerDocument(dome_node, &exc);
@@ -492,6 +526,10 @@ static void _selectX(Request& r, MethodP
 		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(
@@ -504,7 +542,7 @@ static void _selectX(Request& r, MethodP
 
 	Value* result=0;
    	if(res.get())
-		handler(r, expression, res, result);
+		handler(r, expression, res, vnode.get_xdoc(), result);
 	if(result)
 		r.write_no_lang(*result);
 }
@@ -512,6 +550,7 @@ static void _selectX(Request& r, MethodP
 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) {
@@ -526,6 +565,7 @@ static void selectNodesHandler(Request&
 						String::Body::Format(i), 
 						new VXnode(
 							&r.charsets, 
+							xdoc,
 							gdome_xml_n_mkref(res->nodesetval->nodeTab[i])));
 			}
 		break;
@@ -539,8 +579,9 @@ static void selectNodesHandler(Request&
 
 static void selectNodeHandler(Request& r,
 			      const String& expression,
-			      xmlXPathObject_auto_ptr res,
-			      Value*& result) {
+				  xmlXPathObject_auto_ptr res,
+				  VXdoc& xdoc,
+				  Value*& result) {
 	switch(res->type) {
 	case XPATH_UNDEFINED: 
 		break;
@@ -553,6 +594,7 @@ static void selectNodeHandler(Request& r
 			
 			result=new VXnode(
 				&r.charsets, 
+				xdoc,
 				gdome_xml_n_mkref(res->nodesetval->nodeTab[0]));
 		}
 		break;
@@ -577,6 +619,7 @@ static void selectNodeHandler(Request& r
 static void selectBoolHandler(Request&,
 			      const String& expression,
 			      xmlXPathObject_auto_ptr res,
+				  VXdoc& /*xdoc*/,
 			      Value*& result) {
 	switch(res->type) {
 	case XPATH_BOOLEAN: 
@@ -597,6 +640,7 @@ static void selectBoolHandler(Request&,
 static void selectNumberHandler(Request&,
 				const String& expression,
 				xmlXPathObject_auto_ptr res,
+				VXdoc& /*xdoc*/,
 				Value*& result) {
 	switch(res->type) {
 	case XPATH_NUMBER: 
@@ -617,6 +661,7 @@ static void selectNumberHandler(Request&
 static void selectStringHandler(Request& r,
 							  const String& expression,
 							  xmlXPathObject_auto_ptr res,
+							  VXdoc& /*xdoc*/,
 							  Value*& result) {
 	switch(res->type) {
 	case XPATH_UNDEFINED: