--- parser3/src/classes/xnode.C	2003/04/03 10:48:25	1.54.2.10.2.12
+++ parser3/src/classes/xnode.C	2004/02/03 16:27:54	1.64
@@ -7,7 +7,7 @@
 #include "classes.h"
 #ifdef XML
 
-static const char* IDENT_XNODE_C="$Date: 2003/04/03 10:48:25 $";
+static const char * const IDENT_XNODE_C="$Date: 2004/02/03 16:27:54 $";
 
 #include "pa_vmethod_frame.h"
 
@@ -16,6 +16,7 @@ static const char* IDENT_XNODE_C="$Date:
 #include "pa_vxnode.h"
 #include "pa_vxdoc.h"
 #include "pa_vvoid.h"
+#include "pa_xml_exception.h"
 
 #include "xnode.h"
 
@@ -110,7 +111,6 @@ GdomeNode* as_node(MethodParams& params,
 		throw Exception("parser.runtime",
 			0,
 			msg);
-		result=0; // calm, compiler
 	}
 
 	return result;
@@ -146,7 +146,7 @@ static void _insertBefore(Request& r, Me
 		// write out result
 		r.write_no_lang(*new VXnode(&r.charsets, retNode));
 	} else
-		throw Exception(0, exc);
+		throw XmlException(0, exc);
 }
 
 // Node replaceChild(in Node newChild,in Node oldChild) raises(DOMException);
@@ -154,14 +154,14 @@ static void _replaceChild(Request& r, Me
 	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");
+	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 VXnode(&r.charsets, retNode));
 	} else
-		throw Exception(0, exc);
+		throw XmlException(0, exc);
 }
 
 // Node removeChild(in Node oldChild) raises(DOMException);
@@ -175,7 +175,7 @@ static void _removeChild(Request& r, Met
 		// write out result
 		r.write_no_lang(*new VXnode(&r.charsets, retNode));
 	} else
-		throw Exception(0, exc);
+		throw XmlException(0, exc);
 }
 
 // Node appendChild(in Node newChild) raises(DOMException);
@@ -189,7 +189,7 @@ static void _appendChild(Request& r, Met
 		// write out result
 		r.write_no_lang(*new VXnode(&r.charsets, retNode));		
 	}  else
-		throw Exception(0, exc);
+		throw XmlException(0, exc);
 }
 
 // boolean hasChildNodes();
@@ -232,14 +232,14 @@ 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);
 	const String& name=params.as_string(0, "name must be string");
 
 	GdomeException exc;
 	GdomeDOMString *attribute_value=
-		gdome_el_getAttribute(element, r.transcode(name).get(), &exc);
+		gdome_el_getAttribute(element, r.transcode(name).use(), &exc);
 	// write out result
 	r.write_no_lang(r.transcode(attribute_value));
 }
@@ -252,11 +252,11 @@ static void _setAttribute(Request& r, Me
 
 	GdomeException exc;
 	gdome_el_setAttribute(element,
-		r.transcode(name).get(), 
-		r.transcode(attribute_value).get(),
+		r.transcode(name).use(), 
+		r.transcode(attribute_value).use(),
 		&exc);
 	if(exc)
-		throw Exception(0, exc);
+		throw XmlException(0, exc);
 }
 
 // void removeAttribute(in DOMString name) raises(DOMException);
@@ -265,9 +265,9 @@ static void _removeAttribute(Request& r,
 	const String& name=params.as_string(0, "name must be string");
 
 	GdomeException exc;
-	gdome_el_removeAttribute(element, r.transcode(name).get(), &exc);
+	gdome_el_removeAttribute(element, r.transcode(name).use(), &exc);
 	if(exc)
-		throw Exception(0, exc);
+		throw XmlException(0, exc);
 }
 
 // Attr getAttributeNode(in DOMString name);
@@ -276,13 +276,12 @@ static void _getAttributeNode(Request& r
 	const String& name=params.as_string(0, "name must be string");
 
 	GdomeException exc;
-	if(GdomeAttr *attr=gdome_el_getAttributeNode(element, r.transcode(name).get(), &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));
 	} else if(exc)
-		throw Exception(
-			0, 
-			exc);
+		throw XmlException(0, exc);
 }	
 
 // Attr setAttributeNode(in Attr newAttr) raises(DOMException);
@@ -295,9 +294,7 @@ static void _setAttributeNode(Request& r
 		// write out result
 		r.write_no_lang(*new VXnode(&r.charsets, (GdomeNode* )returnAttr));
 	} else
-		throw Exception(
-			0, 
-			exc);
+		throw XmlException(0, exc);
 }	
 
 // Attr removeAttributeNode(in Attr oldAttr) raises(DOMException);
@@ -308,9 +305,7 @@ static void _removeAttributeNode(Request
 	GdomeException exc;
 	gdome_el_removeAttributeNode(element, oldAttr, &exc);
 	if(exc)
-		throw Exception(
-			0, 
-			exc);
+		throw XmlException(0, exc);
 }	
 
 // NodeList getElementsByTagName(in DOMString name);
@@ -322,21 +317,127 @@ static void _getElementsByTagName(Reques
 	VHash& result=*new VHash;
 	GdomeException exc;
 	if(GdomeNodeList *nodes=
-		gdome_el_getElementsByTagName(element, r.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++)
 			result.hash().put(
-				StringBody::Format(i), 
+				String::Body::Format(i), 
 				new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc)));
 	} else if(exc)
-		throw Exception(
-			0, 
-			exc);
+		throw XmlException(0, exc);
 
 	// write out result
 	r.write_no_lang(result);
 }
 
+// DOM 2
+
+// DOMString getAttributeNS(in DOMString namespaceURI, in DOMString localName);
+static void _getAttributeNS(Request& r, MethodParams& params) {
+	GdomeElement* element=get_self_element(r);
+	
+	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
+	const String& localName=params.as_string(0, "localName must be string");
+
+	GdomeException exc;
+	GdomeDOMString *attribute_value=
+		gdome_el_getAttributeNS(element, 
+			r.transcode(namespaceURI).use(),
+			r.transcode(localName).use(), &exc);
+	// write out result
+	r.write_no_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);
+	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 XmlException(0, exc);
+}
+
+// void removeAttributeNS(in DOMString namespaceURI, in DOMString localName) raises(DOMException);
+static void _removeAttributeNS(Request& r, MethodParams& params) {
+	GdomeElement* element=get_self_element(r);
+	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
+	const String& localName=params.as_string(1, "localName must be string");
+
+	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) {
+	GdomeElement* element=get_self_element(r);
+	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, (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);
+	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));
+	} 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);
+
+	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) {
+	GdomeElement* element=get_self_element(r);
+
+	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) {
 	GdomeElement* element=get_self_element(r);
 
@@ -349,13 +450,13 @@ static void _getElementsByTagNameNS(Requ
 	if(GdomeNodeList *nodes=
 		gdome_el_getElementsByTagNameNS(
 			element, 
-			r.transcode(namespaceURI).get(),
-			r.transcode(localName).get(),
+			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(
-				StringBody::Format(i), 
+				String::Body::Format(i), 
 				new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc)));
 	}
 
@@ -371,9 +472,7 @@ static void _normalize(Request& r, Metho
 	GdomeException exc;
 	gdome_n_normalize(selfNode, &exc);
 	if(exc)
-		throw Exception(
-			0, 
-			exc);
+		throw XmlException(0, exc);
 }
 
 static void _selectX(Request& r, MethodParams& params,
@@ -392,7 +491,7 @@ static void _selectX(Request& r, MethodP
 	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));
+	xmlXPathContext_auto_ptr ctxt(xmlXPathNewContext(xml_document));
 	ctxt->node=gdome_xml_n_get_xmlNode(dome_node);
 	/*error to stderr for now*/
 	xmlXPathObject_auto_ptr res(
@@ -400,10 +499,10 @@ static void _selectX(Request& r, MethodP
 
 	if(xmlHaveGenericErrors()) {
 		GdomeException exc=0;
-		throw Exception(&expression, exc);
+		throw XmlException(&expression, exc);
 	}
 
-	Value* result;
+	Value* result=0;
    	if(res.get())
 		handler(r, expression, res, result);
 	if(result)
@@ -424,7 +523,7 @@ static void selectNodesHandler(Request&
 				HashStringValue& hash=vhash.hash();
 				for(int i=0; i<size; i++)
 					hash.put(
-						StringBody::Format(i), 
+						String::Body::Format(i), 
 						new VXnode(
 							&r.charsets, 
 							gdome_xml_n_mkref(res->nodesetval->nodeTab[i])));
@@ -464,9 +563,7 @@ static void selectNodeHandler(Request& r
 		result=new VDouble(res->floatval);
 		break;
 	case XPATH_STRING:
-		result=new VString(
-			r.transcode(GdomeDOMString_auto_ptr(
-				gdome_str_mkref_dup((const gchar *)res->stringval)).get()));
+		result=new VString(r.transcode((xmlChar*)res->stringval));
 		break;
 	default: 
 		throw Exception("parser.runtime",
@@ -477,7 +574,7 @@ static void selectNodeHandler(Request& r
 	}
 }
 
-static void selectBoolHandler(Request& r,
+static void selectBoolHandler(Request&,
 			      const String& expression,
 			      xmlXPathObject_auto_ptr res,
 			      Value*& result) {
@@ -497,10 +594,10 @@ static void selectBoolHandler(Request& r
 	}
 }
 
-static void selectNumberHandler(Request& r,
-							  const String& expression,
-							  xmlXPathObject_auto_ptr res,
-							  Value*& result) {
+static void selectNumberHandler(Request&,
+				const String& expression,
+				xmlXPathObject_auto_ptr res,
+				Value*& result) {
 	switch(res->type) {
 	case XPATH_NUMBER: 
 		result=new VDouble(res->floatval);
@@ -525,9 +622,7 @@ static void selectStringHandler(Request&
 	case XPATH_UNDEFINED: 
 		break;
 	case XPATH_STRING:
-		result=new VString(
-			r.transcode(GdomeDOMString_auto_ptr(
-				gdome_str_mkref_dup((const gchar *)res->stringval)).get()));
+		result=new VString(r.transcode((xmlChar*)res->stringval));
 		break;
 	case XPATH_NODESET: 
 		if(!(res->nodesetval && res->nodesetval->nodeNr))
@@ -568,6 +663,7 @@ static void _selectString(Request& r, Me
 
 // 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)
 {
@@ -607,6 +703,23 @@ MXnode::MXnode(const char* aname, VState
 	// 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);
@@ -623,7 +736,7 @@ MXnode::MXnode(const char* aname, VState
 	// consts
 
 #define CONST(name) \
-	consts.put(StringBody(#name), new VInt(GDOME_##name))
+	consts.put(String::Body(#name), new VInt(GDOME_##name))
 
 	CONST(ELEMENT_NODE);
 	CONST(ATTRIBUTE_NODE);