--- parser3/src/classes/xdoc.C	2001/10/19 14:42:53	1.30
+++ parser3/src/classes/xdoc.C	2001/10/22 16:44:42	1.32
@@ -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.30 2001/10/19 14:42:53 parser Exp $
+	$Id: xdoc.C,v 1.32 2001/10/22 16:44:42 parser Exp $
 */
 #include "pa_types.h"
 #include "classes.h"
@@ -12,7 +12,7 @@
 
 #include "pa_request.h"
 #include "pa_vxdoc.h"
-#include "pa_xslt_stylesheet_manager.h"
+#include "pa_stylesheet_manager.h"
 #include "pa_stylesheet_connection.h"
 #include "pa_vfile.h"
 #include "xnode.h"
@@ -84,10 +84,10 @@ static void _createElement(Request& r, c
 			vdoc.get_document(pool, &method_name).
 			createElement(*pool.transcode(tagName));
 		// write out result
-		VXnode& result=*new(pool) VXnode(pool, node);
+		VXnode& result=*new(pool) VXnode(pool, node, false);
 		r.write_no_lang(result);
 	} catch(const XalanDOMException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 }
 
@@ -100,7 +100,7 @@ static void _createDocumentFragment(Requ
 		vdoc.get_document(pool, &method_name).
 		createDocumentFragment();
 	// write out result
-	VXnode& result=*new(pool) VXnode(pool, node);
+	VXnode& result=*new(pool) VXnode(pool, node, false);
 	r.write_no_lang(result);
 }
 
@@ -115,7 +115,7 @@ static void _createTextNode(Request& r,
 		vdoc.get_document(pool, &method_name).
 		createTextNode(*pool.transcode(data));
 	// write out result
-	VXnode& result=*new(pool) VXnode(pool, node);
+	VXnode& result=*new(pool) VXnode(pool, node, false);
 	r.write_no_lang(result);
 }
 
@@ -130,7 +130,7 @@ static void _createComment(Request& r, c
 		vdoc.get_document(pool, &method_name).
 		createComment(*pool.transcode(data));
 	// write out result
-	VXnode& result=*new(pool) VXnode(pool, node);
+	VXnode& result=*new(pool) VXnode(pool, node, false);
 	r.write_no_lang(result);
 }
 
@@ -146,10 +146,10 @@ static void _createCDATASection(Request&
 			vdoc.get_document(pool, &method_name).
 			createCDATASection(*pool.transcode(data));
 		// write out result
-		VXnode& result=*new(pool) VXnode(pool, node);
+		VXnode& result=*new(pool) VXnode(pool, node, false);
 		r.write_no_lang(result);
 	} catch(const XalanDOMException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 }
 
@@ -166,10 +166,10 @@ static void _createProcessingInstruction
 			vdoc.get_document(pool, &method_name).
 			createProcessingInstruction(*pool.transcode(target), *pool.transcode(data));
 		// write out result
-		VXnode& result=*new(pool) VXnode(pool, node);
+		VXnode& result=*new(pool) VXnode(pool, node, false);
 		r.write_no_lang(result);
 	} catch(const XalanDOMException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 }
 
@@ -185,10 +185,10 @@ static void _createAttribute(Request& r,
 			vdoc.get_document(pool, &method_name).
 			createAttribute(*pool.transcode(name));
 		// write out result
-		VXnode& result=*new(pool) VXnode(pool, node);
+		VXnode& result=*new(pool) VXnode(pool, node, false);
 		r.write_no_lang(result);
 	} catch(const XalanDOMException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 }
 // EntityReference createEntityReference(in DOMString name) raises(DOMException);
@@ -203,10 +203,10 @@ static void _createEntityReference(Reque
 			vdoc.get_document(pool, &method_name).
 			createEntityReference(*pool.transcode(name));
 		// write out result
-		VXnode& result=*new(pool) VXnode(pool, node);
+		VXnode& result=*new(pool) VXnode(pool, node, false);
 		r.write_no_lang(result);
 	} catch(const XalanDOMException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 }
 
@@ -452,7 +452,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) {
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 }
 
@@ -481,7 +481,7 @@ static void _string(Request& r, const St
 		// write out result
 		r.write_no_lang(parserString);
 	} catch(const XSLException& e) {
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 }
 
@@ -520,7 +520,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) {
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 }
 
@@ -540,19 +540,19 @@ static void _set(Request& r, const Strin
 		parsedSource = new XalanDefaultParsedSource2(&stream);
 	}
 	catch (XSLException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 	catch (SAXParseException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 	catch (SAXException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 	catch (XMLException& e) {
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 	catch(const XalanDOMException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 
 	// replace any previous parsed source
@@ -592,19 +592,19 @@ static void _load(Request& r, const Stri
 		parsedSource = new XalanDefaultParsedSource2(filespec);
 	}
 	catch (XSLException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 	catch (SAXParseException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 	catch (SAXException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 	catch (XMLException& e) {
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 	catch(const XalanDOMException& e)	{
-		Exception::convert(pool, &method_name, e);
+		Exception::provide_source(pool, &method_name, e);
 	}
 
 	// replace any previous parsed source
@@ -659,23 +659,23 @@ static void _transform(Request& r, const
 	}
 	catch (XSLException& e)	{
 		connection.close();
-		Exception::convert(pool, &stylesheet_file_name, e);
+		Exception::provide_source(pool, &stylesheet_file_name, e);
 	}
 	catch (SAXParseException& e)	{
 		connection.close();
-		Exception::convert(pool, &stylesheet_file_name, e);
+		Exception::provide_source(pool, &stylesheet_file_name, e);
 	}
 	catch (SAXException& e)	{
 		connection.close();
-		Exception::convert(pool, &stylesheet_file_name, e);
+		Exception::provide_source(pool, &stylesheet_file_name, e);
 	}
 	catch (XMLException& e) {
 		connection.close();
-		Exception::convert(pool, &stylesheet_file_name, e);
+		Exception::provide_source(pool, &stylesheet_file_name, e);
 	}
 	catch(const XalanDOMException& e)	{
 		connection.close();
-		Exception::convert(pool, &stylesheet_file_name, e);
+		Exception::provide_source(pool, &stylesheet_file_name, e);
 	}
 
 	// write out result
@@ -707,7 +707,7 @@ static void _transform(Request& r, const
 	const String& stylesheet_file_name=params->as_string(0, "file name must be string");
 	const String& stylesheet_filespec=r.absolute(stylesheet_file_name);
 	//_asm int 3;
-	Stylesheet_connection& connection=XSLT_stylesheet_manager->get_connection(stylesheet_filespec);
+	Stylesheet_connection& connection=stylesheet_manager->get_connection(stylesheet_filespec);
 
 	// target
 	XalanDocument* target=vdoc.parser_liaison().createDocument();
@@ -721,23 +721,23 @@ static void _transform(Request& r, const
 	}
 	catch (XSLException& e)	{
 		connection.close();
-		Exception::convert(pool, &stylesheet_file_name, e);
+		Exception::provide_source(pool, &stylesheet_file_name, e);
 	}
 	catch (SAXParseException& e)	{
 		connection.close();
-		Exception::convert(pool, &stylesheet_file_name, e);
+		Exception::provide_source(pool, &stylesheet_file_name, e);
 	}
 	catch (SAXException& e)	{
 		connection.close();
-		Exception::convert(pool, &stylesheet_file_name, e);
+		Exception::provide_source(pool, &stylesheet_file_name, e);
 	}
 	catch (XMLException& e) {
 		connection.close();
-		Exception::convert(pool, &stylesheet_file_name, e);
+		Exception::provide_source(pool, &stylesheet_file_name, e);
 	}
 	catch(const XalanDOMException& e)	{
 		connection.close();
-		Exception::convert(pool, &stylesheet_file_name, e);
+		Exception::provide_source(pool, &stylesheet_file_name, e);
 	}
 
 	// write out result
@@ -755,7 +755,7 @@ static void _getElementById(Request& r,
 	if(XalanNode *node=
 		vdoc.get_document(pool, &method_name).getElementById(*pool.transcode(elementId))) {
 		// write out result
-		VXnode& result=*new(pool) VXnode(pool, node);
+		VXnode& result=*new(pool) VXnode(pool, node, false);
 		r.write_no_lang(result);
 	}
 }