--- parser3/src/classes/xnode.C	2002/01/21 16:44:48	1.29
+++ parser3/src/classes/xnode.C	2002/01/28 10:50:03	1.35
@@ -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.29 2002/01/21 16:44:48 paf Exp $
+	$Id: xnode.C,v 1.35 2002/01/28 10:50:03 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_vxdoc.h"
 #include "pa_vvoid.h"
 
 #include "xnode.h"
@@ -23,6 +24,10 @@ extern "C" {
 #include "gdome.h"
 #include "libxml/xpath.h"
 
+// defines 
+
+#define XNODE_CLASS_NAME "xnode"
+
 // classes
 
 class xmlXPathObject_auto_ptr {
@@ -91,16 +96,13 @@ private:
 	xmlXPathContext *_Ptr;
 };
 
-// defines
-
-#define XNODE_CLASS_NAME "xnode"
-
 // helpers
 
 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)
+	if(strcmp(value.type(), VXNODE_TYPE)!=0 
+		|| strcmp(value.type(), VXDOC_TYPE)!=0)
 		throw Exception(0, 0,
 			&method_name,
 			msg);
@@ -212,7 +214,6 @@ static void _hasChildNodes(Request& r, c
 }
 
 // Node cloneNode(in boolean deep);
-/// @test ownerDocument=?
 static void _cloneNode(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	VXnode& vnode=*static_cast<VXnode *>(r.self);
@@ -396,11 +397,11 @@ static void _selectX(Request& r, const S
 	GdomeException exc;
 	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;
+	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));
-	ctxt->node=xmlDocGetRootElement(xml_document);
+	ctxt->node=gdome_xml_n_get_xmlNode(dome_node);
 	/*error to stderr for now*/
 	xmlXPathObject_auto_ptr res(
 		xmlXPathEvalExpression(BAD_CAST pool.transcode(expression)->str, ctxt.get()));
@@ -425,12 +426,12 @@ static void selectNodesHandler(Pool& poo
 							  const String& expression,
 							  xmlXPathObject_auto_ptr res,
 							  Value *& result) {
+	VHash *vhash=new(pool) VHash(pool);  result=vhash;
 	switch(res->type) {
 	case XPATH_UNDEFINED: 
 		break;
 	case XPATH_NODESET:
 		if(int size=res->nodesetval->nodeNr) {
-			VHash *vhash=new(pool) VHash(pool);
 			Hash& hash=vhash->hash(0);
 			for(int i=0; i<size; i++) {
 				String& skey=*new(pool) String(pool);
@@ -441,9 +442,8 @@ static void selectNodesHandler(Pool& poo
 				}
 
 				hash.put(skey, new(pool) VXnode(pool, 
-					gdome_xml_n_mkref(res->nodesetval->nodeTab[0])));
+					gdome_xml_n_mkref(res->nodesetval->nodeTab[i])));
 			}
-			result=vhash;
 		}
 		break;
 	default: