--- parser3/src/classes/xnode.C	2005/12/16 15:08:46	1.73
+++ parser3/src/classes/xnode.C	2007/08/20 08:56:46	1.78
@@ -7,7 +7,7 @@
 #include "classes.h"
 #ifdef XML
 
-static const char * const IDENT_XNODE_C="$Date: 2005/12/16 15:08:46 $";
+static const char * const IDENT_XNODE_C="$Date: 2007/08/20 08:56:46 $";
 
 #include "pa_vmethod_frame.h"
 
@@ -17,6 +17,7 @@ static const char * const IDENT_XNODE_C=
 #include "pa_vxdoc.h"
 #include "pa_vvoid.h"
 #include "pa_xml_exception.h"
+#include "pa_vbool.h"
 
 #include "xnode.h"
 #include "libxml/xpath.h"
@@ -101,7 +102,7 @@ xmlNode& as_node(MethodParams& params, i
 	if(Value* vxnode=value.as(VXNODE_TYPE, false))
 		return static_cast<VXnode*>(vxnode)->get_xmlnode();
 	else
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			msg);
 }
@@ -113,7 +114,7 @@ xmlChar* as_xmlchar(Request& r, MethodPa
 xmlAttr& as_attr(MethodParams& params, int index, const char* msg) {
 	xmlNode& xmlnode=as_node(params, index, msg);
 	if(xmlnode.type!=XML_ATTRIBUTE_NODE)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			msg);
 
@@ -170,7 +171,7 @@ xmlNs& pa_xmlMapNs(xmlDoc& doc, const xm
 static void pa_addAttributeNode(xmlNode& selfNode, xmlAttr& attrNode) 
 {
 	if(attrNode.type!=XML_ATTRIBUTE_NODE)
-		throw Exception("xml",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"must be ATTRIBUTE_NODE");
 
@@ -265,17 +266,22 @@ static void _replaceChild(Request& r, Me
 	xmlDoc& xmldoc=vxdoc.get_xmldoc();
 	xmlNode& selfNode=vnode.get_xmlnode();
 	xmlNode& newChild=as_node(params, 0, "newChild must be node");
-	xmlNode& oldChild=as_node(params, 1, "refChild must be node");
+	xmlNode& oldChild=as_node(params, 1, "oldChild must be node");
 
 	if(newChild.doc!=&xmldoc)
-		throw Exception("xml",
+		throw Exception("xml.dom",
 			0,
 			"WRONG_DOCUMENT_ERR");
 	if(oldChild.doc!=&xmldoc)
-		throw Exception("xml",
+		throw Exception("xml.dom",
 			0,
 			"WRONG_DOCUMENT_ERR");
 
+	if(oldChild.parent!=&selfNode)
+		throw Exception("xml.dom",
+			0,
+			"NOT_FOUND_ERR");
+
 	xmlNode* refChild=oldChild.next;
 	xmlUnlinkNode(&oldChild);
 	xmlNode* retNode;
@@ -297,7 +303,7 @@ static void _removeChild(Request& r, Met
 	xmlNode& oldChild=as_node(params, 0, "refChild must be node");
 	
 	if(oldChild.doc!=&xmldoc)
-		throw Exception("xml",
+		throw Exception("xml.dom",
 			0,
 			"WRONG_DOCUMENT_ERR");
 
@@ -348,7 +354,7 @@ xmlNode& get_self_element(VXnode& vnode)
 	xmlNode& node=vnode.get_xmlnode();
 
 	if(node.type!=XML_ELEMENT_NODE)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"method can only be called on nodes of ELEMENT type");
 
@@ -412,12 +418,12 @@ static void _setAttributeNode(Request& r
 	xmlAttr& newAttr=as_attr(params, 0, "newAttr must be ATTRIBUTE node");
 
 	if(newAttr.doc!=&xmldoc)
-		throw Exception("xml",
+		throw Exception("xml.dom",
 			0,
 			"WRONG_DOCUMENT_ERR");
 
 	if(newAttr.parent)
-		throw Exception("xml",
+		throw Exception("xml.dom",
 			0,
 			"INUSE_ATTRIBUTE_ERR");
 	
@@ -438,7 +444,7 @@ static void _removeAttributeNode(Request
 	xmlAttr& oldAttr=as_attr(params, 0, "oldAttr must be ATTRIBUTE node");
 
 	if(oldAttr.parent!=&element)
-		throw Exception("xml",
+		throw Exception("xml.dom",
 			0,
 			"NOT_FOUND_ERR");
 
@@ -570,6 +576,15 @@ static void _hasAttributeNS(Request& r,
 	r.write_no_lang(*new VBool(prop!=0));
 }
 
+// boolean hasAttributes
+static void _hasAttributes(Request& r, MethodParams&) {
+	VXnode& vnode=GET_SELF(r, VXnode);
+	xmlNode& element=get_self_element(vnode);
+
+	// write out result
+	r.write_no_lang(*new VBool(element.properties!=0));
+}
+
 static void _getElementsByTagNameNS(Request& r, MethodParams& params) {
 	VXnode& vnode=GET_SELF(r, VXnode);
 	VXdoc& vdoc=vnode.get_vxdoc();
@@ -619,7 +634,7 @@ static void register_one_ns(
 			info->r->transcode(key), 
 			info->r->transcode(*svalue));
 	else
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			new String(key, String::L_TAINTED),
 			"value is %s, must be string or number", value->type());
 }
@@ -631,7 +646,7 @@ static void _selectX(Request& r, MethodP
 							  Value*& result)) 
 {
 	VXnode& vnode=GET_SELF(r, VXnode);
-	xmlNode& element=get_self_element(vnode);
+	xmlNode& xmlnode=vnode.get_xmlnode();
 	VXdoc& vdoc=vnode.get_vxdoc();
 	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
@@ -640,9 +655,9 @@ static void _selectX(Request& r, MethodP
 	xmlXPathContext_auto_ptr ctxt(xmlXPathNewContext(&xmldoc));
 	{
 		Register_one_ns_info info={&r, ctxt.get()};
-		vdoc.search_namespaces.hash().for_each(register_one_ns, &info);
+		vdoc.search_namespaces.hash().for_each<Register_one_ns_info*>(register_one_ns, &info);
 	}
-	ctxt->node=&element;
+	ctxt->node=&xmlnode;
 	/*error to stderr for now*/
 	xmlXPathObject_auto_ptr res(
 		xmlXPathEvalExpression(r.transcode(expression), ctxt.get()));
@@ -677,7 +692,7 @@ static void selectNodesHandler(Request&,
 			}
 		break;
 	default: 
-		throw Exception(0,
+		throw Exception(PARSER_RUNTIME,
 			&expression,
 			"wrong xmlXPathEvalExpression result type (%d)", res->type);
 		break; // never
@@ -695,7 +710,7 @@ static void selectNodeHandler(Request& r
 	case XPATH_NODESET: 
 		if(res->nodesetval && res->nodesetval->nodeNr) { // empty result strangly has NODESET  res->type
 			if(res->nodesetval->nodeNr>1)
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					&expression,
 					"resulted not in a single node (%d)", res->nodesetval->nodeNr);
 			
@@ -712,7 +727,7 @@ static void selectNodeHandler(Request& r
 		result=new VString(r.transcode((xmlChar*)res->stringval));
 		break;
 	default: 
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			&expression,
 			"wrong xmlXPathEvalExpression result type (%d)", res->type);
 	}
@@ -732,7 +747,7 @@ static void selectBoolHandler(Request&,
 			break;
 		// else[nodeset] fall down to default
 	default: 
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			&expression,
 			"wrong xmlXPathEvalExpression result type (%d)", res->type);
 		break; // never
@@ -753,7 +768,7 @@ static void selectNumberHandler(Request&
 			break;
 		// else[nodeset] fall down to default
 	default: 
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			&expression,
 			"wrong xmlXPathEvalExpression result type (%d)", res->type);
 		break; // never
@@ -776,7 +791,7 @@ static void selectStringHandler(Request&
 			break;
 		// else[nodeset] fall down to default
 	default: 
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			&expression,
 			"wrong xmlXPathEvalExpression result type (%d)", res->type);
 		break; // never
@@ -866,6 +881,9 @@ MXnode::MXnode(const char* aname, VState
 	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);
+	// boolean hasAttributes
+	add_native_method("hasAttributes", Method::CT_DYNAMIC, _hasAttributes, 0, 0);
+	
 
 	/// parser
 	// ^node.select[/some/xpath/query] = hash $.#[dnode]