--- parser3/src/classes/xnode.C	2002/01/28 10:50:03	1.35
+++ parser3/src/classes/xnode.C	2002/02/26 12:49:45	1.40
@@ -1,10 +1,10 @@
 /** @file
 	Parser: @b dom parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: xnode.C,v 1.35 2002/01/28 10:50:03 paf Exp $
+	$Id: xnode.C,v 1.40 2002/02/26 12:49:45 paf Exp $
 */
 #include "classes.h"
 #ifdef XML
@@ -101,8 +101,8 @@ private:
 GdomeNode *as_node(Pool& pool, const String& method_name, MethodParams *params, 
 						int index, const char *msg) {
 	Value& value=params->as_no_junction(index, msg);
-	if(strcmp(value.type(), VXNODE_TYPE)!=0 
-		|| strcmp(value.type(), VXDOC_TYPE)!=0)
+	if(!(strcmp(value.type(), VXNODE_TYPE)==0 
+		|| strcmp(value.type(), VXDOC_TYPE)==0))
 		throw Exception(0, 0,
 			&method_name,
 			msg);
@@ -368,6 +368,39 @@ static void _getElementsByTagName(Reques
 	r.write_no_lang(result);
 }
 
+static void _getElementsByTagNameNS(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	GdomeElement *element=get_self_element(r, method_name);
+
+	// namespaceURI;localName
+	const String& namespaceURI=params->as_string(0, "namespaceURI must be string");
+	const String& localName=params->as_string(1, "localName must be string");
+
+	GdomeException exc;
+	VHash& result=*new(pool) VHash(pool);
+	if(GdomeNodeList *nodes=
+		gdome_el_getElementsByTagNameNS(
+			element, 
+			pool.transcode(namespaceURI).get(),
+			pool.transcode(localName).get(),
+			&exc)) {
+		gulong length=gdome_nl_length(nodes, &exc);
+		for(gulong i=0; i<length; i++) {
+			String& skey=*new(pool) String(pool);
+			{
+				char *buf=(char *)pool.malloc(MAX_NUMBER);
+				snprintf(buf, MAX_NUMBER, "%d", i);
+				skey << buf;
+			}
+
+			result.hash(0).put(skey, new(pool) VXnode(pool, gdome_nl_item(nodes, i, &exc)));
+		}
+	}
+
+	// write out result
+	r.write_no_lang(result);
+}
+
 // void normalize();
 static void _normalize(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
@@ -431,20 +464,21 @@ static void selectNodesHandler(Pool& poo
 	case XPATH_UNDEFINED: 
 		break;
 	case XPATH_NODESET:
-		if(int size=res->nodesetval->nodeNr) {
-			Hash& hash=vhash->hash(0);
-			for(int i=0; i<size; i++) {
-				String& skey=*new(pool) String(pool);
-				{
-					char *buf=(char *)pool.malloc(MAX_NUMBER);
-					snprintf(buf, MAX_NUMBER, "%d", i);
-					skey << buf;
-				}
+		if(res->nodesetval)
+			if(int size=res->nodesetval->nodeNr) {
+				Hash& hash=vhash->hash(0);
+				for(int i=0; i<size; i++) {
+					String& skey=*new(pool) String(pool);
+					{
+						char *buf=(char *)pool.malloc(MAX_NUMBER);
+						snprintf(buf, MAX_NUMBER, "%d", i);
+						skey << buf;
+					}
 
-				hash.put(skey, new(pool) VXnode(pool, 
-					gdome_xml_n_mkref(res->nodesetval->nodeTab[i])));
+					hash.put(skey, new(pool) VXnode(pool, 
+						gdome_xml_n_mkref(res->nodesetval->nodeTab[i])));
+				}
 			}
-		}
 		break;
 	default: 
 		throw Exception(0, 0,
@@ -462,7 +496,7 @@ static void selectNodeHandler(Pool& pool
 	case XPATH_UNDEFINED: 
 		break;
 	case XPATH_NODESET: 
-		if(res->nodesetval->nodeNr) { // empty result strangly has NODESET  res->type
+		if(res->nodesetval && res->nodesetval->nodeNr) { // empty result strangly has NODESET  res->type
 			if(res->nodesetval->nodeNr>1)
 				throw Exception(0, 0,
 				&expression,
@@ -500,7 +534,7 @@ static void selectBoolHandler(Pool& pool
 		result=new(pool) VBool(pool, res->boolval!=0);
 		break;
 	case XPATH_NODESET: 
-		if(!res->nodesetval->nodeNr)
+		if(!(res->nodesetval && res->nodesetval->nodeNr))
 			break;
 		// else[nodeset] fall down to default
 	default: 
@@ -520,7 +554,7 @@ static void selectNumberHandler(Pool& po
 		result=new(pool) VDouble(pool, res->floatval);
 		break;
 	case XPATH_NODESET:
-		if(!res->nodesetval->nodeNr)
+		if(!(res->nodesetval && res->nodesetval->nodeNr))
 			break;
 		// else[nodeset] fall down to default
 	default: 
@@ -545,7 +579,7 @@ static void selectStringHandler(Pool& po
 					gdome_str_mkref_dup((const gchar *)res->stringval)).get()));
 		break;
 	case XPATH_NODESET: 
-		if(!res->nodesetval->nodeNr)
+		if(!(res->nodesetval && res->nodesetval->nodeNr))
 			break;
 		// else[nodeset] fall down to default
 	default: 
@@ -618,6 +652,8 @@ MXnode::MXnode(Pool& apool) : Methoded(a
 	add_native_method("removeAttributeNode", Method::CT_DYNAMIC, _removeAttributeNode, 1, 1);
 	// NodeList getElementsByTagName(in DOMString name);
 	add_native_method("getElementsByTagName", Method::CT_DYNAMIC, _getElementsByTagName, 1, 1);
+	// NodeList getElementsByTagNameNS(in DOMString namespaceURI, in DOMString localName);
+	add_native_method("getElementsByTagNameNS", Method::CT_DYNAMIC, _getElementsByTagNameNS, 2, 2);
 	// void normalize();
 	add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0);