--- parser3/src/include/pa_charset.h	2003/02/17 12:13:44	1.20.2.11
+++ parser3/src/include/pa_charset.h	2003/04/11 09:58:10	1.22
@@ -1,14 +1,14 @@
 /** @file
 	Parser: Charset connection decl.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_CHARSET_H
 #define PA_CHARSET_H
 
-static const char* IDENT_CHARSET_H="$Date: 2003/02/17 12:13:44 $";
+static const char* IDENT_CHARSET_H="$Date: 2003/04/11 09:58:10 $";
 
 #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(StringPtr aname, StringPtr afile_spec);
-	override ~Charset();
+	Charset(Pool& apool, const String& aname, const String *request_file_spec);
+	Charset::~Charset();
 	
-	StringPtr 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(StringPtr afile_spec);
+	void loadDefinition(const String& request_file_spec);
 	void sort_ToTable();
 
 	void transcodeToUTF8(Pool& pool,
@@ -92,8 +106,7 @@ public:
 
 private:
 
-	StringPtr fname;
-	CharPtr fname_cstr;
+	const String& fname;
 	bool fisUTF8;
 	Tables tables;
 
@@ -101,11 +114,11 @@ private:
 
 private:
 	void addEncoding(char *name_cstr);
-	void initTranscoder(const String *source, const char* name_cstr);
+	void initTranscoder(const String *source, const char *name_cstr);
 	
 public:
 	/// converts GdomeDOMString string to char *
-	const char* transcode_cstr(GdomeDOMString *s);
+	const char *transcode_cstr(GdomeDOMString *s);
 	/// converts GdomeDOMString string to parser String
 	String& transcode(GdomeDOMString *s
 #ifndef NO_STRING_ORIGIN
@@ -113,7 +126,7 @@ public:
 #endif
 		);
 	/// converts xmlChar* null-terminated string to char *
-	const char* transcode_cstr(xmlChar *s);
+	const char *transcode_cstr(xmlChar *s);
 	/// converts xmlChar* null-terminated string to parser String
 	String& transcode(xmlChar *s
 #ifndef NO_STRING_ORIGIN
@@ -123,9 +136,9 @@ public:
 	/** converts sized char * to xmlChar*
 		@returns xmlChar * which caller should free
 	*/
-	xmlChar *transcode_buf2xchar(Pool& pool, const char* buf, size_t buf_size);
+	xmlChar *transcode_buf2xchar(const char *buf, size_t buf_size);
 	/// converts char * to GdomeDOMString
-	GdomeDOMString_auto_ptr transcode_buf2dom(const char* buf, size_t buf_size);
+	GdomeDOMString_auto_ptr transcode_buf2dom(const char *buf, size_t buf_size);
 	/// converts parser String to GdomeDOMString
 	GdomeDOMString_auto_ptr transcode(const String& s);
 
@@ -136,9 +149,6 @@ private:
 #endif
 
 };
-DECLARE_OBJECT_PTR(Charset);
-
-extern CharsetPtr UTF8_charset;
 
 #ifdef XML
 /// Auto-object used to track GdomeDOMString usage
@@ -152,15 +162,20 @@ public:
 	~GdomeDOMString_auto_ptr() {
 		gdome_str_unref(fstring);
 	}
-	GdomeDOMString* get() {
+/*	GdomeDOMString* get() {
+		return fstring;
+	}*/
+	GdomeDOMString* use() {
+		if(fstring)
+			gdome_str_ref(fstring);
 		return fstring;
 	}
 	GdomeDOMString* operator->() {
 		return fstring;
 	}
-	GdomeDOMString& operator*() {
+/*	GdomeDOMString& operator*() {
 		return *fstring;
-	}
+	}*/
 
 	// copying
 	GdomeDOMString_auto_ptr(const GdomeDOMString_auto_ptr& src) : fstring(src.fstring) {
@@ -170,9 +185,11 @@ public:
 		if(this == &src)
 			return *this;
 
-		gdome_str_unref(fstring);
+		if(fstring)
+			gdome_str_unref(fstring);
 		fstring=src.fstring;
-		gdome_str_ref(fstring);
+		if(fstring)
+			gdome_str_ref(fstring);
 
 		return *this;
 	}