--- parser3/src/classes/xdoc.C	2002/01/21 13:04:02	1.66
+++ 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.66 2002/01/21 13:04:02 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) 
@@ -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();
@@ -453,7 +456,7 @@ static void _load(Request& r, const Stri
 		&exc);
 	if(!document || exc || xmlHaveGenericErrors())
 		throw Exception(0, 0, 
-			&method_name, 
+			&uri, 
 			exc);
 
 	// replace any previous parsed source
@@ -717,7 +720,7 @@ static void _transform(Request& r, const
 	if(!transformed || xmlHaveGenericErrors()) {
 		GdomeException exc=0;
 		throw Exception(0, 0,
-			&method_name, 
+			&stylesheet_filespec, 
 			exc);
 	}