--- parser3/src/include/pa_string.h	2003/01/28 12:11:50	1.144.2.10
+++ parser3/src/include/pa_string.h	2003/01/29 12:57:36	1.144.2.16
@@ -8,24 +8,18 @@
 #ifndef PA_STRING_H
 #define PA_STRING_H
 
-static const char* IDENT_STRING_H="$Date: 2003/01/28 12:11:50 $";
+static const char* IDENT_STRING_H="$Date: 2003/01/29 12:57:36 $";
 
 // includes
 
 #include "pa_pool.h"
+#include "pa_types.h"
+#include "pa_array.h"
 
 // forwards
 
-class String;
-
-typedef object_ptr<String> StringPtr;
-typedef object_ptr<const String> ConstStringPtr;
-const ConstStringPtr ConstStringPtrZero(0);
-
-// includes
-
-#include "pa_types.h"
-#include "pa_array.h"
+class String; DECLARE_OBJECT_PTR(String);
+typedef object_ptr<const String> ConstStringPtr; const ConstStringPtr ConstStringPtrZero(0);
 
 // forwards
 
@@ -33,6 +27,7 @@ class Table;
 typedef object_ptr<Table> TablePtr;
 class SQL_Connection;
 class Dictionary;
+class Request_charsets;
 
 // helpers
 
@@ -125,7 +120,6 @@ public:
 
 public:
 
-	//static String& OnPool(Pool& apool, const char *local_src=0, size_t src_size=0, bool tainted=false);
 	explicit String(const char *src=0, size_t src_size=0, bool tainted=false);
 	String(const String& src);
 	bool is_empty() const { return !size(); }
@@ -133,23 +127,23 @@ public:
 	/// convert to C string. if 'lang' known, forcing 'lang' to it
 	CharPtr cstr(Untaint_lang lang=UL_AS_IS, 
 		SQL_Connection *connection=0,
-		Charset *cstr_charset=0, const char *cstr_charset_name=0) const {
+		const Request_charsets *charsets=0) const {
 
-		CharPtr result(new char[cstr_bufsize(lang, connection, cstr_charset)]);
-		char *eol=store_to(result.get(), lang, connection, cstr_charset, cstr_charset_name);
+		CharPtr result(new char[cstr_bufsize(lang, connection, charsets)]);
+		char *eol=store_to(result.get(), lang, connection, charsets);
 		*eol=0;
 		return result;
 	}
 	char *cstr(Pool& pool, Untaint_lang lang=UL_AS_IS, 
 		SQL_Connection *connection=0,
-		Charset *cstr_charset=0, const char *cstr_charset_name=0) const {
+		const Request_charsets *charsets=0) const {
 
-		char *result=new(pool) char[cstr_bufsize(lang, connection, cstr_charset)];
-		char *eol=store_to(result, lang, connection, cstr_charset, cstr_charset_name);
+		char *result=new(pool) char[cstr_bufsize(lang, connection, charsets)];
+		char *eol=store_to(result, lang, connection, charsets);
 		*eol=0;
 		return result;
 	}
-	char *cstr_debug_origins() const;
+	char *cstr_debug_origins(Pool& pool) const;
 	/// puts pieces to buf
 	void serialize(Pool& pool, size_t prolog_size,  char *& buf, size_t& buf_size) const;
 	/// appends pieces from buf to self
@@ -199,9 +193,12 @@ public:
 		return cmp(partial, src_ptr, 0)!=0; 
 	}
 
-	String& append(const String& src, uchar lang, bool forced=false);
+	String& append_to(String& dest, uchar lang, bool forced) const;
+	String& append(const String& src, uchar lang, bool forced=false) { 
+		return src.append_to(*this, lang, forced);
+	}
 	String& operator << (const String& src) { return append(src, UL_PASS_APPENDED); }
-	String& operator << (const StringPtr src) { return append(*src, UL_PASS_APPENDED); }
+	String& operator << (ConstStringPtr src) { return append(*src, UL_PASS_APPENDED); }
 	String& operator << (const char *src) { return APPEND_CONST(src); }
 
 	/// simple hash code of string
@@ -267,12 +264,11 @@ public:
 
 	size_t cstr_bufsize(Untaint_lang lang=UL_UNSPECIFIED,
 		SQL_Connection *connection=0,
-		Charset *buf_charset=0) const;
+		const Request_charsets *charsets=0) const;
 	/// convert to C string, store to 'dest' which must be big enough for proper untaint
 	char *store_to(char *dest, Untaint_lang lang=UL_UNSPECIFIED, 
 		SQL_Connection *connection=0,
-		Charset *store_to_charset=0,
-		const char *store_to_charset_name=0) const;
+		const Request_charsets *charsets=0) const;
 /*
 	void join_chain(
 					   const Chunk*& achunk, const Chunk::Row*& arow, uint& acountdown,