--- parser3/src/include/pa_charset.h	2002/01/14 17:48:56	1.8
+++ parser3/src/include/pa_charset.h	2003/03/06 08:21:09	1.20.2.13
@@ -1,15 +1,15 @@
 /** @file
 	Parser: Charset connection decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_charset.h,v 1.8 2002/01/14 17:48:56 paf Exp $
+	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/03/06 08:21:09 $";
+
 #include "pa_pool.h"
 #include "pa_exception.h"
 #include "pa_common.h"
@@ -26,63 +26,49 @@ namespace PCRE {
 
 // defines
 
-#ifdef XML
-/*#	include <util/XercesDefs.hpp>
-#	include <util/TransService.hpp>
-#	define Charset_TransRec XMLTransService::TransRec
-*/
-
-#	ifndef XMLCh 
-#		define XMLCh unsigned int
-#	endif
-#	ifndef XMLByte
-#		define XMLByte unsigned char
-#	endif
-
-	struct Charset_TransRec {
-		XMLCh intCh;
-		XMLByte extCh;
-	};
+#define MAX_CHARSET_UNI_CODES 500
 
-#else
 #	ifndef XMLCh 
-#		define XMLCh unsigned int
+		typedef unsigned int XMLCh;
 #	endif
 #	ifndef XMLByte
-#		define XMLByte unsigned char
+		typedef unsigned char XMLByte;
 #	endif
 
-	struct Charset_TransRec {
-		XMLCh intCh;
-		XMLByte extCh;
-	};
-#endif
+struct Charset_TransRec {
+	XMLCh intCh;
+	XMLByte extCh;
+};
 
 /**	charset holds name & transcode tables 
-	registers Xerces transcoders
+	registers libxml transcoders
 */
-class Charset : public Pooled {
+class Charset: public PA_Object {
 public:
 
-	Charset(Pool& apool, const String& aname, const String *request_file_spec);
-	Charset::~Charset();
+	Charset(StringPtr aname, StringPtr afile_spec);
+	override ~Charset();
 	
-	const String& name() const { return fname; }
+	StringPtr 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
 	);
 
+#ifdef XML
+	xmlCharEncodingHandler *transcoder(const String *source);
+#endif
+
 public:
 
 	unsigned char pcre_tables[tables_length];
 
 private:
 
-	void loadDefinition(const String& request_file_spec);
+	void load_definition(StringPtr afile_spec);
 	void sort_ToTable();
 
 	void transcodeToUTF8(Pool& pool,
@@ -91,6 +77,7 @@ private:
 	void transcodeFromUTF8(Pool& pool,
 									   const void *source_body, size_t source_content_length,
 									   const void *& dest_body, size_t& dest_content_length) const;
+
 	void transcodeToCharset(Pool& pool,
 										   const Charset& dest_transcoder,
 										   const void *source_body, size_t source_content_length,
@@ -100,13 +87,14 @@ public:
 
 	struct Tables {
 		XMLCh fromTable[0x100];
-		Charset_TransRec *toTable;
+		Charset_TransRec toTable[MAX_CHARSET_UNI_CODES];
 		uint toTableSize;
 	};
 
 private:
 
-	const String& fname;
+	StringPtr fname;
+	CharPtr fname_cstr;
 	bool fisUTF8;
 	Tables tables;
 
@@ -114,30 +102,44 @@ 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);
+	String& transcode(GdomeDOMString *s
+#ifndef NO_STRING_ORIGIN
+		, const String *origin
+#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);
+	String& transcode(xmlChar *s
+#ifndef NO_STRING_ORIGIN
+		, const String *origin
+#endif
+		);
+	/** converts sized char * to xmlChar*
+		@returns xmlChar * which caller should free
+	*/
+	xmlChar *transcode_buf2xchar(Pool& pool, const char* buf, size_t buf_size);
 	/// converts char * to GdomeDOMString
-	GdomeDOMString_auto_ptr transcode_buf(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);
 
 private:
 
-	xmlCharEncodingHandler *transcoder;
+	xmlCharEncodingHandler *ftranscoder;
 
 #endif
 
 };
+DECLARE_OBJECT_PTR(Charset);
 
+#ifdef XML
 /// Auto-object used to track GdomeDOMString usage
 class GdomeDOMString_auto_ptr {
 	GdomeDOMString *fstring;
@@ -174,5 +176,6 @@ public:
 		return *this;
 	}
 };
+#endif
 
 #endif