--- parser3/src/include/pa_string.h	2002/02/21 14:36:54	1.130
+++ parser3/src/include/pa_string.h	2002/04/01 09:37:50	1.133
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_string.h,v 1.130 2002/02/21 14:36:54 paf Exp $
+	$Id: pa_string.h,v 1.133 2002/04/01 09:37:50 paf Exp $
 */
 
 #ifndef PA_STRING_H
@@ -114,10 +114,10 @@ public:
 	/// convert to C string. if 'lang' known, forcing 'lang' to it
 	char *cstr(Untaint_lang lang=UL_AS_IS, 
 		SQL_Connection *connection=0,
-		Charset *cstr_charset=0) const {
+		Charset *cstr_charset=0, const char *cstr_charset_name=0) const {
 
 		char *result=(char *)malloc(cstr_bufsize(lang, connection, cstr_charset));
-		char *eol=store_to(result, lang, connection, cstr_charset);
+		char *eol=store_to(result, lang, connection, cstr_charset, cstr_charset_name);
 		*eol=0;
 		return result;
 	}
@@ -125,7 +125,7 @@ public:
 	/// puts pieces to buf
 	void serialize(size_t prolog_size,  void *& buf, size_t& buf_size) const;
 	/// appends pieces from buf to self
-	void deserialize(size_t prolog_size, void *buf, size_t buf_size, const char *file);
+	bool deserialize(size_t prolog_size, void *buf, size_t buf_size, const char *file);
 	/** append fragment
 		@see APPEND_AS_IS, APPEND_CLEAN, APPEND_TAINTED, APPEND_CONST
 	*/
@@ -276,7 +276,8 @@ private:
 	/// 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;
+		Charset *store_to_charset=0,
+		const char *store_to_charset_name=0) const;
 
 	String& reconstruct(Pool& pool) const;
 	void join_chain(Pool& pool, 
@@ -298,9 +299,8 @@ private: //disabled
 			row=chunk->rows; \
 			countdown=chunk->count; \
 		}; \
-		countdown--;\
 		{ body } \
-		row++; \
+		row++; countdown--; \
 	} 
 
 #define STRING_PREFIX_FOREACH_ROW(self, body) { \