--- parser3/src/classes/xdoc.C	2001/10/05 17:33:50	1.10
+++ parser3/src/classes/xdoc.C	2001/10/11 14:57:53	1.14
@@ -4,7 +4,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: xdoc.C,v 1.10 2001/10/05 17:33:50 parser Exp $
+	$Id: xdoc.C,v 1.14 2001/10/11 14:57:53 parser Exp $
 */
 #include "classes.h"
 #ifdef XML
@@ -20,7 +20,7 @@
 #include <Include/PlatformDefinitions.hpp>
 #include <util/PlatformUtils.hpp>
 #include <util/TransENameMap.hpp>
-#include <XalanTransformer/XalanTransformer.hpp>
+#include "XalanTransformer2.hpp"
 #include <XalanTransformer/XalanParsedSource.hpp>
 #	include <XalanTransformer/XalanDefaultParsedSource.hpp>
 #	include <XalanSourceTree/XalanSourceTreeDocument.hpp>
@@ -110,6 +110,7 @@ public:
 	}
 	
 	~XalanSourceTreeParserLiaison2() {
+		delete ferror_handler;
 	}
 private:
 	ErrorHandler *ferror_handler;
@@ -121,9 +122,6 @@ public:
 
 	XalanDefaultParsedSource2(const XSLTInputSource&		theInputSource);
 
-	virtual
-	~XalanDefaultParsedSource2();
-
 	virtual XalanDocument*
 	getDocument() const;
 
@@ -152,12 +150,6 @@ XalanDefaultParsedSource2::XalanDefaultP
 
 
 
-XalanDefaultParsedSource2::~XalanDefaultParsedSource2()
-{
-}
-
-
-
 XalanDocument*	
 XalanDefaultParsedSource2::getDocument() const
 {
@@ -261,7 +253,7 @@ static void _save(Request& r, const Stri
 		FormatterTreeWalker treeWalker(*formatterListener);
 		treeWalker.traverse(&node); // Walk that node and produce the XML...
 	} catch(const XSLException& e) {
-		r._throw(&method_name, e);
+		pool.exception()._throw(pool, &method_name, e);
 	}
 }
 
@@ -286,7 +278,7 @@ static void _string(Request& r, const St
 		// write out result
 		r.write_no_lang(parserString);
 	} catch(const XSLException& e) {
-		r._throw(&method_name, e);
+		pool.exception()._throw(pool, &method_name, e);
 	}
 }
 
@@ -325,7 +317,7 @@ static void _file(Request& r, const Stri
 		vfile.set(false/*tainted*/, cstr, strlen(cstr), 0/*file_name*/, vcontent_type);
 		r.write_no_lang(vfile);
 	} catch(const XSLException& e) {
-		r._throw(&method_name, e);
+		pool.exception()._throw(pool, &method_name, e);
 	}
 }
 
@@ -339,33 +331,24 @@ static void _set(Request& r, const Strin
 
 	std::istrstream stream(xml.cstr());
 	const XalanParsedSource* parsedSource;
-/*	int error=vdoc.transformer().parseSource(&stream, parsedSource);
 
-	if(error)
-		PTHROW(0, 0,
-			&method_name,
-			vdoc.transformer().getLastError());
-*/
-
-	try
-	{
-			parsedSource = new XalanDefaultParsedSource2(&stream);
-		//todo free parsedSource
+	try {
+		parsedSource = new XalanDefaultParsedSource2(&stream);
 	}
 	catch (XSLException& e)	{
-		r._throw(&method_name, e);
+		pool.exception()._throw(pool, &method_name, e);
 	}
 	catch (SAXParseException& e)	{
-		r._throw(&method_name, e);
+		pool.exception()._throw(pool, &method_name, e);
 	}
 	catch (SAXException& e)	{
-		r._throw(&method_name, e);
+		pool.exception()._throw(pool, &method_name, e);
 	}
 	catch (XMLException& e) {
-		r._throw(&method_name, e);
+		pool.exception()._throw(pool, &method_name, e);
 	}
 	catch(const XalanDOMException&	e)	{
-		r._throw(&method_name, e);
+		pool.exception()._throw(pool, &method_name, e);
 	}
 
 	// replace any previous parsed source
@@ -381,12 +364,24 @@ static void _load(Request& r, const Stri
 	const char *filespec=r.absolute(file_name).cstr(String::UL_FILE_SPEC);
 	
 	const XalanParsedSource* parsedSource;
-	int error=vdoc.transformer().parseSource(filespec, parsedSource);
-
-	if(error)
-		PTHROW(0, 0,
-			&file_name,
-			vdoc.transformer().getLastError());
+	try {
+		parsedSource = new XalanDefaultParsedSource2(filespec);
+	}
+	catch (XSLException& e)	{
+		pool.exception()._throw(pool, &method_name, e);
+	}
+	catch (SAXParseException& e)	{
+		pool.exception()._throw(pool, &method_name, e);
+	}
+	catch (SAXException& e)	{
+		pool.exception()._throw(pool, &method_name, e);
+	}
+	catch (XMLException& e) {
+		pool.exception()._throw(pool, &method_name, e);
+	}
+	catch(const XalanDOMException&	e)	{
+		pool.exception()._throw(pool, &method_name, e);
+	}
 
 	// replace any previous parsed source
 	vdoc.set_parsed_source(*parsedSource);
@@ -394,7 +389,7 @@ static void _load(Request& r, const Stri
 
 static void add_xslt_param(const Hash::Key& aattribute, Hash::Val *ameaning, 
 						   void *info) {
-	XalanTransformer& transformer=*static_cast<XalanTransformer *>(info);
+	XalanTransformer2& transformer=*static_cast<XalanTransformer2 *>(info);
 	const char *attribute_cstr=aattribute.cstr();
 	const char *meaning_cstr=static_cast<Value *>(ameaning)->as_string().cstr();
 
@@ -429,18 +424,34 @@ static void _transform(Request& r, const
 
 	// target
 	XalanDocument* target=vdoc.parser_liaison().createDocument();
-	XSLTResultTarget domResultTarget(target);
 
 	// transform
-	int error=vdoc.transformer().transform(
-		parsed_source, 
-		&connection.stylesheet(true/*nocache*/), 
-		domResultTarget);
-	connection.close();
-	if(error)
-		PTHROW(0, 0,
-			&stylesheet_file_name,
-			vdoc.transformer().getLastError());
+	try {
+		vdoc.transformer().transform2(
+			parsed_source, 
+			&connection.stylesheet(true/*nocache*/), 
+			target);
+	}
+	catch (XSLException& e)	{
+		connection.close();
+		pool.exception()._throw(pool, &stylesheet_file_name, e);
+	}
+	catch (SAXParseException& e)	{
+		connection.close();
+		pool.exception()._throw(pool, &stylesheet_file_name, e);
+	}
+	catch (SAXException& e)	{
+		connection.close();
+		pool.exception()._throw(pool, &stylesheet_file_name, e);
+	}
+	catch (XMLException& e) {
+		connection.close();
+		pool.exception()._throw(pool, &stylesheet_file_name, e);
+	}
+	catch(const XalanDOMException&	e)	{
+		connection.close();
+		pool.exception()._throw(pool, &stylesheet_file_name, e);
+	}
 
 	// write out result
 	VXdoc& result=*new(pool) VXdoc(pool);