--- parser3/src/classes/xdoc.C	2002/01/23 13:07:53	1.72
+++ parser3/src/classes/xdoc.C	2002/01/29 08:45:36	1.80
@@ -4,9 +4,10 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: xdoc.C,v 1.72 2002/01/23 13:07:53 paf Exp $
+	$Id: xdoc.C,v 1.80 2002/01/29 08:45:36 paf Exp $
 */
 #include "pa_types.h"
+#include "classes.h"
 #ifdef XML
 
 #include "gdome.h"
@@ -20,7 +21,6 @@ extern "C" {
 #include "libxslt/xsltutils.h"
 
 #include "pa_stylesheet_connection.h"
-#include "classes.h"
 #include "pa_request.h"
 #include "pa_vxdoc.h"
 #include "pa_charset.h"
@@ -371,8 +371,29 @@ static void _getElementById(Request& r,
 			&method_name, 
 			exc);
 }
+
+static void _importNode(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+
+	GdomeNode *importedNode=
+		as_node(pool, method_name, params, 0, "importedNode must be node");
+	bool deep=
+		params->as_bool(1, "deep must be bool", r);
+
+	GdomeException exc;
+	GdomeNode *outputNode=gdome_doc_importNode(vdoc.get_document(&method_name), 
+		importedNode,
+		deep, &exc);
+	if(exc)
+		throw Exception(0, 0, 
+			&method_name, 
+			exc);
+
+	// write out result
+	r.write_no_lang(*new(pool) VXnode(pool, outputNode));
+}
 /*
-GdomeNode *gdome_doc_importNode (GdomeDocument *self, GdomeNode *importedNode, GdomeBoolean deep, GdomeException *exc);
 GdomeElement *gdome_doc_createElementNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc);
 GdomeAttr *gdome_doc_createAttributeNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc);
 */
@@ -423,17 +444,17 @@ static void _set(Request& r, const Strin
 	Temp_lang temp_lang(r, String::UL_XML);
 	const String& xml=r.process(vxml).as_string();
 
-	GdomeException exc;
-	GdomeDocument *document=gdome_di_createDocFromMemory(domimpl,
-		xml.cstr(String::UL_UNSPECIFIED, r.connection(0)),
-		GDOME_LOAD_PARSING
-		/* GDOME_LOAD_VALIDATING  pending until kill warning of no-dtd*/ 
-		/*|GDOME_LOAD_SUBSTITUTE_ENTITIES */,
-		&exc);
-	if(!document || exc || xmlHaveGenericErrors())
+	const char *cstr=xml.cstr(String::UL_UNSPECIFIED);
+	GdomeDocument *document=(GdomeDocument *)
+		gdome_xml_n_mkref((xmlNode *)xmlParseMemory(
+			cstr, strlen(cstr)
+		));
+	if(!document || xmlHaveGenericErrors()) {
+		GdomeException exc=0;
 		throw Exception(0, 0, 
 			&method_name, 
 			exc);
+	}
 
 	// replace any previous parsed source
 	vdoc.set_document(document);
@@ -447,17 +468,14 @@ static void _load(Request& r, const Stri
 	const String& file_name=params->as_string(0, "uri must be string");
 	const String& uri=r.absolute(file_name);
 	
-	GdomeException exc;
-	GdomeDocument *document=gdome_di_createDocFromURI(domimpl,
-		uri.cstr(),
-		GDOME_LOAD_PARSING
-		/* GDOME_LOAD_VALIDATING  pending until kill warning of no-dtd*/ 
-		/*|GDOME_LOAD_SUBSTITUTE_ENTITIES */,
-		&exc);
-	if(!document || exc || xmlHaveGenericErrors())
+	GdomeDocument *document=(GdomeDocument *)
+		gdome_xml_n_mkref((xmlNode *)xmlParseFile(uri.cstr()));
+	if(!document || xmlHaveGenericErrors()) {
+		GdomeException exc=0;
 		throw Exception(0, 0, 
 			&uri, 
 			exc);
+	}
 
 	// replace any previous parsed source
 	vdoc.set_document(document);
@@ -594,8 +612,13 @@ static void xdoc2buf(Pool& pool, VXdoc&
 	OOE2STYLE(standalone);
 	OOE2STYLE(omitXmlDeclaration);
 
-	xmlDoc *document=((Gdome_xml_Document*)vdoc.get_document(&method_name))->n;
-	xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get());
+	xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document(&method_name));
+	if(xsltSaveResultTo	n(outputBuffer.get(), document, stylesheet.get())<0) {
+		GdomeException exc=0;
+		throw Exception(0, 0, 
+			&method_name, 
+			exc);
+	}
 
 	// write out result
 	char *gnome_buf;  size_t gnome_size;
@@ -607,15 +630,15 @@ static void xdoc2buf(Pool& pool, VXdoc&
 		gnome_buf=(char *)outputBuffer->buffer->content;
 	}
 	if(file_spec)
-		file_write(pool, 
+		file_write(
 					*file_spec,
 					gnome_buf, gnome_size, 
 					true/*as_text*/);
-	else {
-		*parser_size=gnome_size;
+	else if(*parser_size=gnome_size) {
 		*parser_buf=(char *)pool.malloc(gnome_size);
 		memcpy(*parser_buf, gnome_buf, gnome_size);
-	}
+	} else
+		*parser_buf=0;
 }
 
 static void _file(Request& r, const String& method_name, MethodParams *params) {
@@ -707,7 +730,7 @@ static void _transform(Request& r, const
 
 	// transform
 	xsltStylesheet *stylesheet=connection->stylesheet(false/*nocache*/);
-	xmlDoc *document=((Gdome_xml_Document*)vdoc.get_document(&method_name))->n;
+	xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document(&method_name));
 	xsltTransformContext_auto_ptr transformContext(
 		xsltNewTransformContext(stylesheet, document));
 	xmlDoc *transformed=xsltApplyStylesheetUser(
@@ -795,11 +818,14 @@ MXdoc::MXdoc(Pool& apool) : MXnode(apool
 	// ^xdoc.getElementsByTagNameNS[namespaceURI;localName] = array of nodes
 	add_native_method("getElementsByTagNameNS", Method::CT_DYNAMIC, _getElementsByTagNameNS, 2, 2);
 
-	/// DOM2(?)
+	/// DOM2
 
 	// ^xdoc.getElementById[elementId]
 	add_native_method("getElementById", Method::CT_DYNAMIC, _getElementById, 1, 1);
 
+    // Node (in Node importedNode, in boolean deep) raises(DOMException)
+	add_native_method("importNode", Method::CT_DYNAMIC, _importNode, 2, 2);
+
 	/// parser
 	
 	// ^xdoc::create{qualifiedName}