--- parser3/src/main/pa_charset.C	2003/01/28 11:38:50	1.33.2.2
+++ parser3/src/main/pa_charset.C	2003/03/21 09:43:48	1.34
@@ -5,10 +5,11 @@
 	Author: Alexander Petrosyan<paf@design.ru>(http://paf.design.ru)
 */
 
-static const char* IDENT_CHARSET_C="$Date: 2003/01/28 11:38:50 $";
+static const char* IDENT_CHARSET_C="$Date: 2003/03/21 09:43:48 $";
 
 #include "pa_charset.h"
-//#include "pa_globals.h"
+#include "pa_array.h"
+#include "pa_hash.h"
 
 #ifdef XML
 #include "libxml/encoding.h"
@@ -16,11 +17,6 @@ static const char* IDENT_CHARSET_C="$Dat
 
 // globals
 
-#define CHARSET_UTF8_NAME "UTF-8"
-
-CharsetPtr UTF8_charset(new Charset(ConstStringPtr(new String(CHARSET_UTF8_NAME)), 
-					 ConstStringPtrZero/*no file=system*/,
-					 0/* no file=no file read pool*/));
 
 // consts
 
@@ -80,18 +76,18 @@ static void element2case(unsigned char f
 // methods
 
 extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c
-Charset::Charset(ConstStringPtr aname, ConstStringPtr afile_spec, Pool* apool_for_load): 
-	fname(aname),
-	fname_cstr(aname->cstr()) {
+Charset::Charset(Pool& apool, const String& aname, const String *request_file_spec): Pooled(apool),
+	fname(aname) {
 
-	for(char *c=fname_cstr; *c; c++)
+	char *name_cstr=fname.cstr();
+    for(char *c=name_cstr; *c; c++)
         *c = toupper(*c);
 
-	if(afile_spec && apool_for_load) {
+	if(request_file_spec) {
 		fisUTF8=false;
-		loadDefinition(*apool_for_load, fname);
+		loadDefinition(*request_file_spec);
 #ifdef XML
-		addEncoding(fname_cstr);
+		addEncoding(name_cstr);
 #endif
 	} else {
 		fisUTF8=true;
@@ -100,18 +96,17 @@ Charset::Charset(ConstStringPtr aname, C
 	}
 
 #ifdef XML
-	initTranscoder(fname, fname_cstr);
+	initTranscoder(&aname, name_cstr);
 #endif
 }
 
 Charset::~Charset() {
-	// @todonow unregister encodings
 #ifdef XML
 	// not deleting transcoder, that's not our business
 #endif
 }
 
-void Charset::loadDefinition(Pool& apool_for_load, ConstStringPtr afile_spec) {
+void Charset::loadDefinition(const String& request_file_spec) {
 	// pcre_tables
 	// lowcase, flipcase, bits digit+word+whitespace, masks
 
@@ -123,7 +118,7 @@ void Charset::loadDefinition(Pool& apool
 
 	// charset
 	memset(tables.fromTable, 0, sizeof(tables.fromTable));
-	tables.toTable=(Charset_TransRec *)apool_for_load.calloc(sizeof(Charset_TransRec)*MAX_CHARSET_UNI_CODES);
+	tables.toTable=(Charset_TransRec *)calloc(sizeof(Charset_TransRec)*MAX_CHARSET_UNI_CODES);
 	tables.toTableSize=0;
 	// strangly vital
 	tables.toTable[tables.toTableSize].intCh=0;
@@ -131,7 +126,7 @@ void Charset::loadDefinition(Pool& apool
 	tables.toTableSize++;
 
 	// loading text
-	char *data=file_read_text(apool_for_load, *UTF8_charset, afile_spec);
+	char *data=file_read_text(pool(), request_file_spec);
 
 	// ignore header
 	getrow(&data);
@@ -161,7 +156,7 @@ void Charset::loadDefinition(Pool& apool
 				// charset
 				if(tables.toTableSize>MAX_CHARSET_UNI_CODES)
 					throw Exception("parser.runtime",
-						afile_spec,
+						&request_file_spec,
 						"charset must contain not more then %d unicode values", MAX_CHARSET_UNI_CODES);
 
 				XMLCh unicode=(XMLCh)to_wchar_code(cell);
@@ -422,7 +417,7 @@ static int transcodeFromUTF8(
 
             default:
                 throw Exception(0,
-					Exception::undefined_source,
+					0,
 					"transcodeFromUTF8 error: wrong trailingBytes value(%d)", trailingBytes);
         }
         tmpVal-=gUTFOffsets[trailingBytes];
@@ -437,7 +432,7 @@ static int transcodeFromUTF8(
 				outPtr+=sprintf((char *)outPtr, "&#%d;", tmpVal); // &#decimal;
 		} else
 			throw Exception(0,
-				Exception::undefined_source,
+				0,
 				"transcodeFromUTF8 error: too big tmpVal(0x%08X)", tmpVal);
 	}
 
@@ -657,3 +652,51 @@ GdomeDOMString_auto_ptr Charset::transco
 	return transcode_buf2dom(cstr, strlen(cstr)); 
 }
 #endif
+
+String& Charset::transcode(Pool& pool, 
+	const Charset& source_transcoder, 
+	const Charset& dest_transcoder, 
+	const String& src) {
+
+	const char *src_ptr=src.cstr(String::UL_UNSPECIFIED);
+	size_t src_size=strlen(src_ptr);
+
+	const void *dest_ptr;
+	size_t dest_size;
+
+	Charset::transcode(pool, 
+		source_transcoder, (const void*)src_ptr, src_size,
+		dest_transcoder, dest_ptr, dest_size);
+
+	return *new(pool) String(pool, (const char*)dest_ptr, dest_size);
+}
+
+void Charset::transcode(Pool& pool, 
+	const Charset& source_transcoder, 
+	const Charset& dest_transcoder, 
+	Array& src) {
+	for(int i=0; i<src.size(); i++)
+		src.put(i, &transcode(pool, source_transcoder, dest_transcoder, *src.get_string(i)));
+}
+
+#ifndef DOXYGEN
+struct Transcode_pair_info {
+	Pool* pool;
+	const Charset* source_transcoder;
+	const Charset* dest_transcoder;
+};
+#endif
+static void transcode_pair(const Hash::Key& key, Hash::Val *& value, void *raw_info) {
+	Transcode_pair_info& info=*static_cast<Transcode_pair_info*>(raw_info);
+	value=&Charset::transcode(*info.pool, 
+		*info.source_transcoder, 
+		*info.dest_transcoder, 
+		*static_cast<String*>(value));
+}
+void Charset::transcode(Pool& pool, 
+	const Charset& source_transcoder, 
+	const Charset& dest_transcoder, 
+	Hash& src) {
+	Transcode_pair_info info={&pool, &source_transcoder, &dest_transcoder};
+	src.for_each(transcode_pair, &info);
+}