--- parser3/src/classes/xnode.C	2002/01/10 17:18:45	1.21
+++ parser3/src/classes/xnode.C	2002/01/11 12:39:05	1.23
@@ -4,7 +4,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: xnode.C,v 1.21 2002/01/10 17:18:45 paf Exp $
+	$Id: xnode.C,v 1.23 2002/01/11 12:39:05 paf Exp $
 */
 #include "classes.h"
 #ifdef XML
@@ -12,6 +12,7 @@
 #include "pa_charset.h"
 #include "pa_request.h"
 #include "pa_vxnode.h"
+#include "pa_vvoid.h"
 
 #include "xnode.h"
 
@@ -427,11 +428,13 @@ static void _selectSingle(Request& r, co
 	const String& expression=params->as_string(0, "expression must be string");
 
 	GdomeException exc;
-	xmlDoc *document=
-		((_Gdome_xml_Document *)gdome_n_ownerDocument(
-			vnode.get_node(&method_name), &exc))->n;
-    xmlXPathContext_auto_ptr ctxt(xmlXPathNewContext(document));
-	ctxt->node=xmlDocGetRootElement(document);
+	GdomeNode *dome_node=vnode.get_node(&method_name);
+	GdomeDocument *dome_document=gdome_n_ownerDocument(dome_node, &exc);
+	if(!dome_document)
+		dome_document=GDOME_DOC(dome_node);
+	xmlDoc *xml_document=((_Gdome_xml_Document *)dome_document)->n;
+    xmlXPathContext_auto_ptr ctxt(xmlXPathNewContext(xml_document));
+	ctxt->node=xmlDocGetRootElement(xml_document);
 	/*error to stderr for now*/
 	xmlXPathObject_auto_ptr res(
 		xmlXPathEvalExpression(BAD_CAST pool.transcode(expression)->str, ctxt.get()));
@@ -441,6 +444,8 @@ static void _selectSingle(Request& r, co
 		case XPATH_UNDEFINED: break;
 		case XPATH_NODESET: 
 			{
+				if(!res->nodesetval->nodeNr)
+					break; // empty result strangly has NODESET  res->type
 				if(res->nodesetval->nodeNr>1)
 					throw Exception(0, 0,
 					&expression,
@@ -451,7 +456,7 @@ static void _selectSingle(Request& r, co
 					gdome_xml_n_mkref(res->nodesetval->nodeTab[0]));
 				result.set_name(method_name);
 				r.write_no_lang(result);
-				break;
+				return;
 			}
 		//case XPATH_BOOLEAN: nothing; break;
 		//case XPATH_NUMBER: nothing; break;