--- parser3/src/main/pa_pool.C	2001/11/16 11:07:58	1.42
+++ parser3/src/main/pa_pool.C	2002/12/24 09:55:34	1.58
@@ -1,43 +1,46 @@
 /** @file
 	Parser: pool class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_pool.C,v 1.42 2001/11/16 11:07:58 paf Exp $
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
+static const char* IDENT_POOL_C="$Date: 2002/12/24 09:55:34 $";
+
 #include "pa_pool.h"
 #include "pa_exception.h"
 #include "pa_common.h"
 #include "pa_sapi.h"
-
-#ifdef XML
-#include <util/PlatformUtils.hpp>
-#endif
+#include "pa_charset.h"
 
 Pool::Pool(void *astorage) : 
-	fstorage(astorage), fcontext(0), ftag(0)
-#ifdef XML
-	, transcoder(0) 
-#endif
+	fstorage(astorage), fcontext(0), 
+	ftotal_allocated(0), ftotal_times(0),
+	source_charset(0), client_charset(0)
 	{
-#ifdef XML
-	charset=new(*this) String(*this, "UTF-8");
-#else
-	charset=new(*this) String(*this, "");
-#endif
 }
 
-Pool::~Pool() {
-#ifdef XML
-	delete transcoder;
-#endif
+void *Pool::copy(const void *buf, const size_t size) {
+	if(!buf || !size)
+		return 0;
+
+	void *result=malloc(size);
+	memcpy(result, buf, size);
+	return result;
+}
+
+char *Pool::copy(const char *cstr) {
+	if(cstr) {
+		size_t size=strlen(cstr)+1;
+		return (char *)copy(cstr, size);
+	}
+	return 0;
 }
 
+
 void Pool::fail_alloc(size_t size) const {
-	SAPI::die("out of pooled memory: failed to allocate %u bytes, "
-		"total allocated %u in %u times", 
+	SAPI::die("out of pool memory: failed to allocate %u bytes; "
+		"already allocated on pool: %u bytes in %u times", 
 		size, 
 		ftotal_allocated, ftotal_times);
 }
@@ -46,85 +49,61 @@ void Pool::fail_register_cleanup() const
 	SAPI::die("failed to register cleanup");
 }
 
-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
-	}
+void Pool::set_source_charset(Charset& acharset) { 
+	source_charset=&acharset; 
+}
+Charset& Pool::get_source_charset() { 
+	if(!source_charset)
+		throw Exception(0,
+			0,
+			"no source charset defined yet");
+	return *source_charset; 
+}
+
+void Pool::set_client_charset(Charset& acharset) { 
+	client_charset=&acharset; 
+}
+Charset& Pool::get_client_charset() { 
+	if(!client_charset)
+		throw Exception(0,
+			0,
+			"no client charset defined yet");
+	return *client_charset; 
 }
 
 #ifdef XML
-void Pool::update_transcoder() {
-	if(transcoder)
-		return;
-
-	XMLTransService::Codes resValue;
-	transcoder=XMLPlatformUtils::fgTransService->makeNewTranscoderFor(charset->cstr(), resValue, 60);
-	if(!transcoder)
-		throw Exception(0, 0,
-			charset,
-			"unsupported encoding");
-}
-
-const char *Pool::transcode_cstr(const XalanDOMString& s) { 
-	update_transcoder();
-
-	const unsigned int len=s.size()*2;
-	XMLByte* dest=(XMLByte *)malloc((len+1)*sizeof(XMLByte));
-	bool error=true;
-	try {
-		if(transcoder) {
-			unsigned int charsEaten;
-			unsigned int size=transcoder->transcodeTo(
-				s.c_str(), s.length(),
-				dest, len,
-				charsEaten,
-				XMLTranscoder::UnRep_RepChar //UnRep_Throw
-			);
-			dest[size]=0;
-			error=false;
-		}
-	} catch(XMLException& e) {
-		Exception::provide_source(*this, 0, e);
-	}
-	return (const char *)dest;
+
+const char *Pool::transcode_cstr(xmlChar *s) {
+	return get_source_charset().transcode_cstr(s); 
 }
-String& Pool::transcode(const XalanDOMString& s) { 
-	return *new(*this) String(*this, transcode_cstr(s)); 
+
+String& Pool::transcode(xmlChar *s
+#ifndef NO_STRING_ORIGIN
+		, const String *origin
+#endif
+						) {
+	return get_source_charset().transcode(s, origin); 
 }
 
-std::auto_ptr<XalanDOMString> Pool::transcode_buf(const char *buf, size_t buf_size) { 
-	update_transcoder();
+const char *Pool::transcode_cstr(GdomeDOMString *s) { 
+	return get_source_charset().transcode_cstr(s); 
+}
 
-	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);
+String& Pool::transcode(GdomeDOMString *s
+#ifndef NO_STRING_ORIGIN
+		, const String *origin
+#endif
+	) { 
+	return get_source_charset().transcode(s, origin);
+}
+
+xmlChar *Pool::transcode_buf2xchar(const char *buf, size_t buf_size) {
+	return get_source_charset().transcode_buf2xchar(buf, buf_size); 
 }
-std::auto_ptr<XalanDOMString> Pool::transcode(const String& s) { 
-	const char *cstr=s.cstr(String::UL_UNSPECIFIED);
 
-	return transcode_buf(cstr, strlen(cstr)); 
+GdomeDOMString_auto_ptr Pool::transcode(const String& s) {
+	return get_source_charset().transcode(s); 
 }
 
+
 #endif