--- parser3/src/classes/xdoc.C	2002/01/16 10:28:34	1.65
+++ 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.65 2002/01/16 10:28:34 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
 
@@ -51,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) 
@@ -84,8 +88,8 @@ private:
 
 class xsltTransformContext_auto_ptr {
 public:
-	explicit xsltTransformContext_auto_ptr(xsltTransformContext *_P = 0) 
-		: _Owns(_P != 0), _Ptr(_P) {}
+	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) 
@@ -117,8 +121,8 @@ private:
 
 class xsltStylesheet_auto_ptr {
 public:
-	explicit xsltStylesheet_auto_ptr(xsltStylesheet *_P = 0) 
-		: _Owns(_P != 0), _Ptr(_P) {}
+	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) 
@@ -362,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);
@@ -389,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);
@@ -399,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);
@@ -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();
@@ -427,7 +430,7 @@ static void _set(Request& r, const Strin
 		/* 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);
@@ -451,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
@@ -714,10 +717,12 @@ static void _transform(Request& r, const
 		0/*const char *output*/,
 		0/*FILE *profile*/,
 		transformContext.get());
-	if(!transformed)
+	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
 	transformed->type=XML_DOCUMENT_NODE;