--- parser3/src/main/pa_pool.C	2001/09/21 14:46:09	1.26
+++ parser3/src/main/pa_pool.C	2001/10/22 16:44:42	1.38
@@ -2,28 +2,29 @@
 	Parser: pool class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: pa_pool.C,v 1.38 2001/10/22 16:44:42 parser Exp $
 */
-static const char *RCSId="$Id: pa_pool.C,v 1.26 2001/09/21 14:46:09 parser Exp $"; 
 
 #include "pa_pool.h"
 #include "pa_exception.h"
 #include "pa_common.h"
 
 #ifdef XML
-#include <PlatformSupport/DOMStringHelper.hpp>
 #include <util/PlatformUtils.hpp>
 #endif
 
 Pool::Pool(void *astorage) : 
-	fstorage(astorage), fcontext(0), ftag(0), fexception(0)
+	fstorage(astorage), fcontext(0), ftag(0)
 #ifdef XML
 	, transcoder(0) 
 #endif
 	{
 #ifdef XML
 	charset=new(*this) String(*this, "UTF-8");
+#else
+	charset=new(*this) String(*this, "");
 #endif
 }
 
@@ -34,25 +35,27 @@ Pool::~Pool() {
 }
 
 void Pool::fail_alloc(size_t size) const {
-	fexception->_throw(0, 0,
+	throw Exception(0, 0,
 		0,
 		"failed to allocate %u bytes", size);
 }
 
 void Pool::fail_register_cleanup() const {
-	fexception->_throw(0, 0,
+	throw Exception(0, 0,
 		0,
 		"failed to register cleanup");
 }
 
-#ifdef XML
 void Pool::set_charset(const String &new_charset) {
 	if(new_charset!=*charset) {
+#ifdef XML
 		delete transcoder;  transcoder=0; // flag "we need new transcoder"
+#endif
 		charset=&new_charset; // for this charset
 	}
 }
 
+#ifdef XML
 void Pool::update_transcoder() {
 	if(transcoder)
 		return;
@@ -60,7 +63,7 @@ void Pool::update_transcoder() {
 	XMLTransService::Codes resValue;
 	transcoder=XMLPlatformUtils::fgTransService->makeNewTranscoderFor(charset->cstr(), resValue, 60);
 	if(!transcoder)
-		THROW(0, 0,
+		throw Exception(0, 0,
 			charset,
 			"unsupported encoding");
 }
@@ -83,11 +86,8 @@ const char *Pool::transcode_cstr(const X
 			dest[size]=0;
 			error=false;
 		}
-	} catch(...) {
-	}
-	if(error) {
-		memset(dest, '?', s.size());
-		((char *)dest)[s.size()]=0;
+	} catch(XMLException& e) {
+		Exception::provide_source(*this, 0, e);
 	}
 	return (const char *)dest;
 }
@@ -95,25 +95,36 @@ String& Pool::transcode(const XalanDOMSt
 	return *new(*this) String(*this, transcode_cstr(s)); 
 }
 
-void Pool::_throw(const String *source, const XSLException& e) {
-	if(e.getURI().empty())
-		THROW(0, 0,
-			source,
-			"%s (%s)",
-				transcode(e.getMessage()),  // message for exception
-				transcode(e.getType()) // type of exception
-		);
-	else
-		THROW(0, 0,
-			source,
-			"%s (%s) %s(%d:%d)'", 
-				transcode(e.getMessage()),  // message for exception
-				transcode(e.getType()), // type of exception
-				
-				transcode(e.getURI()),  // URI for the associated document, if any
-				e.getLineNumber(),  // line number, or -1 if unknown
-				e.getColumnNumber() // column number, or -1 if unknown
-		);
+std::auto_ptr<XalanDOMString> Pool::transcode_buf(const char *buf, size_t buf_size) { 
+	update_transcoder();
+
+	unsigned int dest_size=0;
+	XMLCh* dest=(XMLCh *)malloc((buf_size+1)*sizeof(XMLCh));
+	unsigned char *charSizes=(unsigned char *)malloc(buf_size*sizeof(unsigned char));
+	XalanDOMString *result;
+	try {
+		if(transcoder) {
+			unsigned int bytesEaten;
+			unsigned int dest_size=transcoder->transcodeFrom(
+				(unsigned char *)buf,
+				(const unsigned int)buf_size,
+				dest, (const unsigned int)buf_size,
+				bytesEaten,
+				charSizes
+			);
+			result=new XalanDOMString(dest, dest_size);
+		}
+	} catch(XMLException& e) {
+		Exception::provide_source(*this, 0, e);
+		result=0; //calm, compiler
+	}
+	
+	return std::auto_ptr<XalanDOMString>(result);
+}
+std::auto_ptr<XalanDOMString> Pool::transcode(const String& s) { 
+	const char *cstr=s.cstr(String::UL_XML);
+
+	return transcode_buf(cstr, strlen(cstr)); 
 }
 
 #endif