--- parser3/src/include/pa_charset.h	2003/03/07 14:56:59	1.20.2.17
+++ parser3/src/include/pa_charset.h	2003/04/10 09:15:23	1.20.2.18.2.9
@@ -8,9 +8,9 @@
 #ifndef PA_CHARSET_H
 #define PA_CHARSET_H
 
-static const char* IDENT_CHARSET_H="$Date: 2003/03/07 14:56:59 $";
+static const char* IDENT_CHARSET_H="$Date: 2003/04/10 09:15:23 $";
+
 
-#include "pa_pool.h"
 #include "pa_exception.h"
 #include "pa_common.h"
 
@@ -26,6 +26,8 @@ namespace PCRE {
 
 // defines
 
+#define MAX_CHARSETS 10
+
 #define MAX_CHARSET_UNI_CODES 500
 
 #	ifndef XMLCh 
@@ -52,20 +54,19 @@ struct Charset_TransRec {
 class Charset: public PA_Object {
 public:
 
-	Charset(StringPtr aname, StringPtr afile_spec);
-	override ~Charset();
+	Charset(Request_charsets* charsets, const StringBody ANAME, const String* afile_spec);
 	
-	StringPtr name() const { return fname; }
+	const StringBody NAME() const { return FNAME; }
 
 	bool isUTF8() const { return fisUTF8; }
 
-	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::C transcode(const String::C src,
+		const Charset& source_transcoder, 
+		const Charset& dest_transcoder
 	);
 
 #ifdef XML
-	xmlCharEncodingHandler& transcoder(StringPtr source);
+	xmlCharEncodingHandler& transcoder(const StringBody NAME);
 #endif
 
 public:
@@ -74,20 +75,14 @@ public:
 
 private:
 
-	void load_definition(StringPtr afile_spec);
+	void load_definition(Request_charsets& charsets, const String& afile_spec);
 	void sort_ToTable();
 
-	void transcodeToUTF8(Pool& pool,
-									 const void* source_body, size_t source_content_length,
-									 const void* & dest_body, size_t& dest_content_length) const;
-	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,
-										   const void*& dest_body, size_t& dest_content_length) const;
+	const String::C transcodeToUTF8(const String::C src) const;
+	const String::C transcodeFromUTF8(const String::C src) const;
+	
+	const String::C transcodeToCharset(const String::C src,
+		const Charset& dest_transcoder) const;
 
 public:
 
@@ -99,8 +94,8 @@ public:
 
 private:
 
-	StringPtr fname;
-	CharPtr fname_cstr;
+	const StringBody FNAME;
+	char* FNAME_CSTR;
 	bool fisUTF8;
 	Tables tables;
 
@@ -108,25 +103,17 @@ private:
 
 private:
 	void addEncoding(char* name_cstr);
-	void initTranscoder(StringPtr source, const char* name_cstr);
+	void initTranscoder(const StringBody name, const char* name_cstr);
 	
 public:
 	/// converts GdomeDOMString string to char* 
-	const char* transcode_cstr(Pool& pool, GdomeDOMString* s);
+	String::C transcode_cstr(GdomeDOMString* s);
 	/// converts GdomeDOMString string to parser String
-	StringPtr transcode(Pool& pool, GdomeDOMString* s
-#ifndef NO_STRING_ORIGIN
-		, StringPtr origin
-#endif
-		);
+	const String& transcode(GdomeDOMString* s);
 	/// converts xmlChar* null-terminated string to char* 
-	const char* transcode_cstr(Pool& pool, xmlChar* s);
+	String::C transcode_cstr(xmlChar* s);
 	/// converts xmlChar* null-terminated string to parser String
-	StringPtr transcode(Pool& pool, xmlChar* s
-#ifndef NO_STRING_ORIGIN
-		, StringPtr origin
-#endif
-		);
+	const String& transcode(xmlChar* s);
 
 	/** converts sized char*  to xmlChar*
 		@returns xmlChar*  WHICH CALLER SHOULD FREE
@@ -139,7 +126,9 @@ public:
 	/// converts char*  to GdomeDOMString
 	GdomeDOMString_auto_ptr transcode_buf2dom(const char* buf, size_t buf_size);
 	/// converts parser String to GdomeDOMString
-	GdomeDOMString_auto_ptr transcode(StringPtr s);
+	GdomeDOMString_auto_ptr transcode(const String& s);
+	/// converts parser StringBody to GdomeDOMString
+	GdomeDOMString_auto_ptr transcode(const StringBody s);
 
 private:
 
@@ -149,14 +138,11 @@ private:
 
 private:
 
-	typedef smart_ptr<xmlCharEncodingHandler> xmlCharEncodingHandlerPtr;
-	xmlCharEncodingHandlerPtr fcreated_handler;
 	xmlCharEncodingHandler* ftranscoder;
 
 #endif
 
 };
-DECLARE_OBJECT_PTR(Charset);
 
 #ifdef XML
 /// Auto-object used to track GdomeDOMString usage
@@ -165,11 +151,12 @@ class GdomeDOMString_auto_ptr {
 public:
 	/// frees astring afterwards!!!
 	explicit GdomeDOMString_auto_ptr(gchar* astring) : fstring(gdome_str_mkref_own(astring)) {}
-	explicit GdomeDOMString_auto_ptr(GdomeDOMString* astring) : fstring(astring) {
+	explicit GdomeDOMString_auto_ptr(GdomeDOMString* astring=0) : fstring(astring) {
 		// not ref-ing, owning
 	}
 	~GdomeDOMString_auto_ptr() {
-		gdome_str_unref(fstring);
+		if(fstring)
+			gdome_str_unref(fstring);
 	}
 	GdomeDOMString* get() {
 		return fstring;
@@ -189,9 +176,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;
 	}