--- parser3/src/include/pa_charset.h	2003/01/30 14:59:43	1.20.2.8
+++ parser3/src/include/pa_charset.h	2003/03/21 09:43:48	1.21
@@ -8,7 +8,7 @@
 #ifndef PA_CHARSET_H
 #define PA_CHARSET_H
 
-static const char* IDENT_CHARSET_H="$Date: 2003/01/30 14:59:43 $";
+static const char* IDENT_CHARSET_H="$Date: 2003/03/21 09:43:48 $";
 
 #include "pa_pool.h"
 #include "pa_exception.h"
@@ -39,24 +39,38 @@ struct Charset_TransRec {
 };
 
 /**	charset holds name & transcode tables 
-	registers libxml transcoders
+	registers Xerces transcoders
 */
-class Charset: public PA_Object {
-	Pool pool_for_load;
+class Charset : public Pooled {
 public:
 
-	Charset(ConstStringPtr aname, ConstStringPtr afile_spec);
-	override ~Charset();
+	Charset(Pool& apool, const String& aname, const String *request_file_spec);
+	Charset::~Charset();
 	
-	ConstStringPtr name() const { return fname; }
+	const String& name() const { return fname; }
 
 	bool isUTF8() const { return fisUTF8; }
 
-	static void transcode(Pool& pool, 
+	static void transcode(Pool& pool,
 		const Charset& source_transcoder, const void *source_body, size_t source_content_length,
 		const Charset& dest_transcoder, const void *& dest_body, size_t& dest_content_length
 	);
 
+	static String& transcode(Pool& pool, 
+		const Charset& source_transcoder, 
+		const Charset& dest_transcoder, 
+		const String& src);
+
+	static void transcode(Pool& pool, 
+		const Charset& source_transcoder, 
+		const Charset& dest_transcoder, 
+		Array& src);
+
+	static void transcode(Pool& pool, 
+		const Charset& source_transcoder, 
+		const Charset& dest_transcoder, 
+		Hash& src);
+
 #ifdef XML
 	xmlCharEncodingHandler *transcoder(const String *source);
 #endif
@@ -67,7 +81,7 @@ public:
 
 private:
 
-	void load_definition(ConstStringPtr afile_spec);
+	void loadDefinition(const String& request_file_spec);
 	void sort_ToTable();
 
 	void transcodeToUTF8(Pool& pool,
@@ -92,8 +106,7 @@ public:
 
 private:
 
-	ConstStringPtr fname;
-	CharPtr fname_cstr;
+	const String& fname;
 	bool fisUTF8;
 	Tables tables;
 
@@ -136,9 +149,6 @@ private:
 #endif
 
 };
-DECLARE_OBJECT_PTR(Charset);
-
-extern CharsetPtr UTF8_charset;
 
 #ifdef XML
 /// Auto-object used to track GdomeDOMString usage