--- parser3/src/include/pa_string.h	2002/02/20 12:40:24	1.129
+++ 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.129 2002/02/20 12:40:24 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
 	*/
@@ -249,10 +249,9 @@ private:
 #endif
 			} item;
 			Chunk *link;  ///< link to the next chunk in chain
-		} rows[CR_PREALLOCATED_COUNT];
+		} rows[CR_PREALLOCATED_COUNT+1/*for head.rows[CR_PREALLOCATED_COUNT].link*/];
 	}
 		head;  ///< the head chunk of the chunk chain
-	Chunk *initial_head_link; ///< next rows initially are here[can shrink! @see String::append]. must go right after 'head'
 
 	/// next append would write to this record
 	Chunk::Row *append_here;
@@ -277,11 +276,12 @@ 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, 
-					   uint& ai, const Chunk*& achunk, const Chunk::Row*& arow,
+					   const Chunk*& achunk, const Chunk::Row*& arow, uint& acountdown, 
 					   uchar& joined_lang, const char *& joined_ptr, size_t& joined_size) const;
 	String& replace_in_reconstructed(Pool& pool, Dictionary& dict) const;
 
@@ -292,18 +292,22 @@ private: //disabled
 };
 #include "pa_pragma_pack_end.h"
 
-#define STRING_PREFIX_FOREACH_ROW(src, body) { \
-	const Chunk *chunk=&(src).head;  \
-	do { \
-		const Chunk::Row *row=chunk->rows; \
-		for(uint i=0; i<chunk->count; i++, row++) { \
-			if(row==(src).append_here) \
-				goto break2; \
-			\
-			body \
-		} \
-		chunk=row->link; \
-	} while(chunk); \
+#define STRING_PREPARED_FOREACH_ROW(self, body) \
+	while(row!=(self).append_here) { \
+		if(countdown==0) { \
+			chunk=row->link; \
+			row=chunk->rows; \
+			countdown=chunk->count; \
+		}; \
+		{ body } \
+		row++; countdown--; \
+	} 
+
+#define STRING_PREFIX_FOREACH_ROW(self, body) { \
+	const Chunk *chunk=&(self).head;  \
+	const Chunk::Row *row=chunk->rows; \
+	uint countdown=chunk->count; \
+	STRING_PREPARED_FOREACH_ROW(self, body) \
 }
 
 #define STRING_FOREACH_ROW(body) STRING_PREFIX_FOREACH_ROW(*this, body)