--- parser3/src/classes/xdoc.C	2002/01/15 16:02:42	1.63
+++ parser3/src/classes/xdoc.C	2002/01/23 13:07:53	1.72
@@ -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.63 2002/01/15 16:02:42 paf Exp $
+	$Id: xdoc.C,v 1.72 2002/01/23 13:07:53 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
 
@@ -32,7 +36,6 @@ extern "C" {
 #define XDOC_OUTPUT_METHOD_OPTION_VALUE_XML "xml"
 #define XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML "html"
 #define XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT "text"
-#define XDOC_OUTPUT_DEFAULT_INDENT 4
 
 // class
 
@@ -52,8 +55,8 @@ public: // Methoded
 
 class xmlOutputBuffer_auto_ptr {
 public:
-	explicit xmlOutputBuffer_auto_ptr(xmlOutputBuffer *_P = 0) 
-		: _Owns(_P != 0), _Ptr(_P) {}
+	explicit xmlOutputBuffer_auto_ptr(xmlOutputBuffer *_APtr = 0) 
+		: _Owns(_APtr != 0), _Ptr(_APtr) {}
 	xmlOutputBuffer_auto_ptr(const xmlOutputBuffer_auto_ptr& _Y) 
 		: _Owns(_Y._Owns), _Ptr(_Y.release()) {}
 	xmlOutputBuffer_auto_ptr& operator=(const xmlOutputBuffer_auto_ptr& _Y) 
@@ -83,7 +86,71 @@ private:
 	xmlOutputBuffer *_Ptr;
 };
 
+class xsltTransformContext_auto_ptr {
+public:
+	explicit xsltTransformContext_auto_ptr(xsltTransformContext *_APtr = 0) 
+		: _Owns(_APtr != 0), _Ptr(_APtr) {}
+	xsltTransformContext_auto_ptr(const xsltTransformContext_auto_ptr& _Y) 
+		: _Owns(_Y._Owns), _Ptr(_Y.release()) {}
+	xsltTransformContext_auto_ptr& operator=(const xsltTransformContext_auto_ptr& _Y) 
+		{if (this != &_Y)
+			{if (_Ptr != _Y.get())
+				{if (_Owns && _Ptr)
+					xsltFreeTransformContext(_Ptr);
+				_Owns = _Y._Owns; }
+			else if (_Y._Owns)
+				_Owns = true;
+			_Ptr = _Y.release(); }
+		return (*this); }
+	~xsltTransformContext_auto_ptr()
+		{if (_Owns && _Ptr)
+			xsltFreeTransformContext(_Ptr); }
+	xsltTransformContext& operator*() const 
+		{return (*get()); }
+	xsltTransformContext *operator->() const 
+		{return (get()); }
+	xsltTransformContext *get() const 
+		{return (_Ptr); }
+	xsltTransformContext *release() const 
+		{((xsltTransformContext_auto_ptr *)this)->_Owns = false;
+		return (_Ptr); }
+private:
+	bool _Owns;
+	xsltTransformContext *_Ptr;
+};
 
+class xsltStylesheet_auto_ptr {
+public:
+	explicit xsltStylesheet_auto_ptr(xsltStylesheet *_APtr = 0) 
+		: _Owns(_APtr != 0), _Ptr(_APtr) {}
+	xsltStylesheet_auto_ptr(const xsltStylesheet_auto_ptr& _Y) 
+		: _Owns(_Y._Owns), _Ptr(_Y.release()) {}
+	xsltStylesheet_auto_ptr& operator=(const xsltStylesheet_auto_ptr& _Y) 
+		{if (this != &_Y)
+			{if (_Ptr != _Y.get())
+				{if (_Owns && _Ptr)
+					xsltFreeStylesheet(_Ptr);
+				_Owns = _Y._Owns; }
+			else if (_Y._Owns)
+				_Owns = true;
+			_Ptr = _Y.release(); }
+		return (*this); }
+	~xsltStylesheet_auto_ptr()
+		{if (_Owns && _Ptr)
+			xsltFreeStylesheet(_Ptr); }
+	xsltStylesheet& operator*() const 
+		{return (*get()); }
+	xsltStylesheet *operator->() const 
+		{return (get()); }
+	xsltStylesheet *get() const 
+		{return (_Ptr); }
+	xsltStylesheet *release() const 
+		{((xsltStylesheet_auto_ptr *)this)->_Owns = false;
+		return (_Ptr); }
+private:
+	bool _Owns;
+	xsltStylesheet *_Ptr;
+};
 
 // methods
 
@@ -299,7 +366,7 @@ static void _getElementById(Request& r,
 		// write out result
 		VXnode& result=*new(pool) VXnode(pool, node);
 		r.write_no_lang(result);
-	} else if(exc)
+	} else if(exc || xmlHaveGenericErrors())
 		throw Exception(0, 0, 
 			&method_name, 
 			exc);
@@ -326,7 +393,7 @@ static void _create(Request& r, const St
 		0/*publicId* /, 
 		0/*systemId* /, 
 		&exc);
-	if(!documentType || exc)
+	if(!documentType || exc || xmlHaveGenericErrors())
 		throw Exception(0, 0, 
 			&method_name, 
 			exc);
@@ -336,7 +403,7 @@ static void _create(Request& r, const St
 		pool.transcode(qualifiedName).get(), 
 		0/*doctype*/, 
 		&exc);
-	if(!document || exc)
+	if(!document || exc || xmlHaveGenericErrors())
 		throw Exception(0, 0, 
 			&method_name, 
 			exc);
@@ -347,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();
@@ -359,12 +425,12 @@ static void _set(Request& r, const Strin
 
 	GdomeException exc;
 	GdomeDocument *document=gdome_di_createDocFromMemory(domimpl,
-		xml.cstr(String::UL_UNSPECIFIED, r.connection),
+		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)
+	if(!document || exc || xmlHaveGenericErrors())
 		throw Exception(0, 0, 
 			&method_name, 
 			exc);
@@ -388,9 +454,9 @@ static void _load(Request& r, const Stri
 		/* GDOME_LOAD_VALIDATING  pending until kill warning of no-dtd*/ 
 		/*|GDOME_LOAD_SUBSTITUTE_ENTITIES */,
 		&exc);
-	if(!document || exc)
+	if(!document || exc || xmlHaveGenericErrors())
 		throw Exception(0, 0, 
-			&method_name, 
+			&uri, 
 			exc);
 
 	// replace any previous parsed source
@@ -507,8 +573,8 @@ static void xdoc2buf(Pool& pool, VXdoc&
 
 	xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(encoder));
 
-	xsltStylesheet *stylesheet=xsltNewStylesheet();
-	if(!stylesheet)
+	xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet());
+	if(!stylesheet.get())
 		throw Exception(0, 0,
 			&method_name,
 			"xsltNewStylesheet failed");
@@ -529,8 +595,7 @@ static void xdoc2buf(Pool& pool, VXdoc&
 	OOE2STYLE(omitXmlDeclaration);
 
 	xmlDoc *document=((Gdome_xml_Document*)vdoc.get_document(&method_name))->n;
-	xsltSaveResultTo(outputBuffer.get(), document, stylesheet);
-	xsltFreeStylesheet(stylesheet);
+	xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get());
 
 	// write out result
 	char *gnome_buf;  size_t gnome_size;
@@ -560,7 +625,7 @@ static void _file(Request& r, const Stri
 	char *buf; size_t buf_size;
 	xdoc2buf(pool, vdoc, method_name, params, 0, 
 		oo,
-		0/*memory*/,
+		0/*not to file, to memory*/,
 		&buf, &buf_size);
 	// write out result
 	r.write_no_lang(*new(pool) String(pool, buf, buf_size));
@@ -601,7 +666,7 @@ static void _string(Request& r, const St
 	char *buf; size_t buf_size;
 	xdoc2buf(pool, vdoc, method_name, params, 0, 
 		oo,
-		0/*to memory*/,
+		0/*not to file, to memory*/,
 		&buf, &buf_size);
 	// write out result
 	r.write_no_lang(*new(pool) String(pool, buf, buf_size));
@@ -638,26 +703,25 @@ static void _transform(Request& r, const
 
 	// stylesheet
 	const String& stylesheet_filespec=r.absolute(params->as_string(0, "file name must be string"));
-	Stylesheet_connection& connection=stylesheet_manager->get_connection(stylesheet_filespec);
+	Stylesheet_connection_ptr connection=stylesheet_manager->get_connection(stylesheet_filespec);
 
 	// transform
-	xsltStylesheet *stylesheet=connection.stylesheet(false/*nocache*/);
+	xsltStylesheet *stylesheet=connection->stylesheet(false/*nocache*/);
 	xmlDoc *document=((Gdome_xml_Document*)vdoc.get_document(&method_name))->n;
-	xsltTransformContext *transformContext=xsltNewTransformContext(stylesheet, document);
+	xsltTransformContext_auto_ptr transformContext(
+		xsltNewTransformContext(stylesheet, document));
 	xmlDoc *transformed=xsltApplyStylesheetUser(
 		stylesheet,
 		document,
 		transform_params,
 		0/*const char *output*/,
 		0/*FILE *profile*/,
-		transformContext);
-	if(!transformed) {
-		xsltFreeTransformContext(transformContext);
-		// close
-		connection.close();
+		transformContext.get());
+	if(!transformed || xmlHaveGenericErrors()) {
+		GdomeException exc=0;
 		throw Exception(0, 0,
-			&method_name, 
-			"transform failed. TODO: show errors");
+			&stylesheet_filespec, 
+			exc);
 	}
 
 	//gdome_xml_doc_mkref dislikes XML_HTML_DOCUMENT_NODE  type, fixing
@@ -697,13 +761,8 @@ static void _transform(Request& r, const
 	oo.standalone=stylesheet->standalone!=0;
 	oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration!=0;
 
-	xsltFreeTransformContext(transformContext);
-	// close
-	connection.close();
-
 	// write out result
 	r.write_no_lang(result);
-
 }
 
 // constructor