--- parser3/src/include/pa_charset.h	2001/12/27 19:57:08	1.3
+++ parser3/src/include/pa_charset.h	2002/01/25 11:22:51	1.11
@@ -4,7 +4,7 @@
 	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.3 2001/12/27 19:57:08 paf Exp $
+	$Id: pa_charset.h,v 1.11 2002/01/25 11:22:51 paf Exp $
 */
 
 #ifndef PA_CHARSET_H
@@ -26,37 +26,17 @@ namespace PCRE {
 
 // defines
 
-#ifdef XML
-/*#	include <util/XercesDefs.hpp>
-#	include <util/TransService.hpp>
-#	define Charset_TransRec XMLTransService::TransRec
-*/
-
 #	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;
-	};
-
-#else
-#	ifndef XMLCh 
-#		define XMLCh unsigned int
-#	endif
-#	ifndef XMLByte
-#		define XMLByte unsigned char
-#	endif
-
-	struct Charset_TransRec {
-		XMLCh intCh;
-		XMLByte extCh;
-	};
-#endif
+struct Charset_TransRec {
+	XMLCh intCh;
+	XMLByte extCh;
+};
 
 /**	charset holds name & transcode tables 
 	registers Xerces transcoders
@@ -76,6 +56,10 @@ public:
 		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];
@@ -85,7 +69,6 @@ private:
 	void loadDefinition(const String& request_file_spec);
 	void sort_ToTable();
 
-	XMLByte xlatOneTo(const XMLCh toXlat) const;
 	void transcodeToUTF8(Pool& pool,
 									 const void *source_body, size_t source_content_length,
 									 const void *& dest_body, size_t& dest_content_length) const;
@@ -97,36 +80,83 @@ private:
 										   const void *source_body, size_t source_content_length,
 										   const void *& dest_body, size_t& dest_content_length) const;
 
+public:
+
+	struct Tables {
+		XMLCh fromTable[0x100];
+		Charset_TransRec *toTable;
+		uint toTableSize;
+	};
+
 private:
 
 	const String& fname;
 	bool fisUTF8;
-	XMLCh fromTable[0x100];
-	Charset_TransRec *toTable;
-	uint toTableSize;
+	Tables tables;
 
 #ifdef XML
 
 private:
-	void addEncoding(const char *name_cstr);
+	void addEncoding(char *name_cstr);
 	void initTranscoder(const String *source, const char *name_cstr);
-
+	
 public:
 	/// converts GdomeDOMString string to char *
 	const char *transcode_cstr(GdomeDOMString *s);
 	/// converts GdomeDOMString string to parser String
 	String& transcode(GdomeDOMString *s);
+	/// converts xmlChar* null-terminated string to char *
+	const char *transcode_cstr(xmlChar *s);
+	/// converts xmlChar* null-terminated string to parser String
+	String& transcode(xmlChar *s);
 	/// converts char * to GdomeDOMString
-	GdomeDOMString *transcode_buf(const char *buf, size_t buf_size);
+	GdomeDOMString_auto_ptr transcode_buf(const char *buf, size_t buf_size);
 	/// converts parser String to GdomeDOMString
-	GdomeDOMString *transcode(const String& s);
+	GdomeDOMString_auto_ptr transcode(const String& s);
 
 private:
 
-	xmlCharEncodingHandler *transcoder;
+	xmlCharEncodingHandler *ftranscoder;
 
 #endif
 
 };
 
+/// Auto-object used to track GdomeDOMString usage
+class GdomeDOMString_auto_ptr {
+	GdomeDOMString *fstring;
+public:
+	explicit GdomeDOMString_auto_ptr(gchar *astring) : fstring(gdome_str_mkref(astring)) {}
+	explicit GdomeDOMString_auto_ptr(GdomeDOMString *astring) : fstring(astring) {
+		// not ref-ing, owning
+	}
+	~GdomeDOMString_auto_ptr() {
+		gdome_str_unref(fstring);
+	}
+	GdomeDOMString* get() {
+		return fstring;
+	}
+	GdomeDOMString* operator->() {
+		return fstring;
+	}
+	GdomeDOMString& operator*() {
+		return *fstring;
+	}
+
+	// copying
+	GdomeDOMString_auto_ptr(const GdomeDOMString_auto_ptr& src) : fstring(src.fstring) {
+		gdome_str_ref(fstring);
+	}
+	GdomeDOMString_auto_ptr& operator =(const GdomeDOMString_auto_ptr& src) {
+		if(this == &src)
+			return *this;
+
+		gdome_str_unref(fstring);
+		fstring=src.fstring;
+		gdome_str_ref(fstring);
+
+		return *this;
+	}
+};
+
 #endif