--- parser3/src/classes/xdoc.C	2002/01/21 16:53:17	1.68
+++ parser3/src/classes/xdoc.C	2002/01/28 08:20:33	1.78
@@ -4,11 +4,21 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: xdoc.C,v 1.68 2002/01/21 16:53:17 paf Exp $
+	$Id: xdoc.C,v 1.78 2002/01/28 08:20:33 paf Exp $
 */
 #include "pa_types.h"
 #ifdef XML
 
+#include "gdome.h"
+#include "libxml/tree.h"
+extern "C" {
+#include "gdomecore/gdome-xml-node.h"
+#include "gdomecore/gdome-xml-document.h"
+};
+#include "libxslt/xsltInternals.h"
+#include "libxslt/transform.h"
+#include "libxslt/xsltutils.h"
+
 #include "pa_stylesheet_connection.h"
 #include "classes.h"
 #include "pa_request.h"
@@ -17,12 +27,6 @@
 #include "pa_vfile.h"
 #include "xnode.h"
 
-extern "C" {
-#include "gdomecore/gdome-xml-node.h"
-#include "gdomecore/gdome-xml-document.h"
-};
-#include "libxslt/transform.h"
-#include "libxslt/xsltutils.h"
 
 // defines
 
@@ -410,7 +414,6 @@ static void _create(Request& r, const St
 	vdoc.set_document(document);
 }
 
-/// @test xmlSAXParseMemory(NULL<<error handler subst, buffer, size, 0)
 static void _set(Request& r, const String& method_name, MethodParams *params) {
 //	_asm int 3;
 	Pool& pool=r.pool();
@@ -420,17 +423,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);
@@ -444,17 +447,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, 
-			&method_name, 
+			&uri, 
 			exc);
+	}
 
 	// replace any previous parsed source
 	vdoc.set_document(document);
@@ -591,8 +591,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(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;
@@ -604,15 +609,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) {
@@ -704,7 +709,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(