--- parser3/src/classes/table.C	2009/04/16 01:10:21	1.249
+++ parser3/src/classes/table.C	2009/05/13 08:36:08	1.254
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2009/04/16 01:10:21 $";
+static const char * const IDENT_TABLE_C="$Date: 2009/05/13 08:36:08 $";
 
 #ifndef NO_STRINGSTREAM
 #include <sstream>
@@ -130,7 +130,7 @@ struct TableSeparators {
 	char encloser; const String* sencloser;
 
 	TableSeparators():
-		column('\t'), scolumn(new String("\t", false)),
+		column('\t'), scolumn(new String("\t")),
 		encloser(0), sencloser(0)
 	{}
 	int load( HashStringValue& options ) {
@@ -230,9 +230,9 @@ static void _create(Request& r, MethodPa
 	Array_iterator<const String*> i(rows);
 	while(i.has_next()) {
 		Table::element_type row(new ArrayString);
-		const String&  string=*i.next();
+		const String& string=*i.next();
 		// remove comment lines
-		if(!string.length())
+		if(string.is_empty())
 			continue;
 
 		size_t col_pos_after=0;
@@ -359,7 +359,7 @@ static void _load(Request& r, MethodPara
 
 		skip_empty_and_comment_lines(&data);
 		while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
-			*columns+=new String(sr.piece, 0, true);
+			*columns+=new String(sr.piece, true/*tainted*/);
 			if(sr.delim=='\n') 
 				break;
 		}
@@ -374,7 +374,7 @@ static void _load(Request& r, MethodPara
 	while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
 		if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n]
 			break;
-		*row+=new String(sr.piece, 0, true);
+		*row+=new String(sr.piece, true/*tainted*/);
 		if(sr.delim=='\n') {
 			table+=row;
 			row=new ArrayString(columns_count);
@@ -619,27 +619,40 @@ static void _menu(Request& r, MethodPara
 	Value* delim_maybe_code=params.count()>1?&params[1]:0;
 
 	Table& table=GET_SELF(r, VTable).table();
-	bool need_delim=false;
 	int saved_current=table.current();
 	int size=table.count();
-	for(int row=0; row<size; row++) {
-		table.set_current(row);
 
-		StringOrValue sv_processed=r.process(body_code);
-		Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
-
-		const String* s_processed=sv_processed.get_string();
-		if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body
-			if(need_delim) // need delim & iteration produced string?
-				r.write_pass_lang(r.process(*delim_maybe_code));
-			else
-				need_delim=true;
-		}
+	if(delim_maybe_code) { // delimiter set
+		bool need_delim=false;
+		for(int row=0; row<size; row++) {
+			table.set_current(row);
+
+			StringOrValue sv_processed=r.process(body_code);
+			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+
+			const String* s_processed=sv_processed.get_string();
+			if(s_processed && !s_processed->is_empty()) { // we have body
+				if(need_delim) // need delim & iteration produced string?
+					r.write_pass_lang(r.process(*delim_maybe_code));
+				else
+					need_delim=true;
+			}
 
-		r.write_pass_lang(sv_processed);
+			r.write_pass_lang(sv_processed);
 
-		if(lskip==Request::SKIP_BREAK)
-			break;
+			if(lskip==Request::SKIP_BREAK)
+				break;
+		}
+	} else {
+		for(int row=0; row<size; row++) {
+			table.set_current(row);
+ 
+			r.process_write(body_code);
+			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+ 
+			if(lskip==Request::SKIP_BREAK)
+				break;
+		}
 	}
 	table.set_current(saved_current);
 }
@@ -1034,9 +1047,9 @@ public:
 		columns(*new ArrayString), row(0), table(0) {
 	}
 
-	bool add_column(SQL_Error& error, const char *str, size_t length) {
+	bool add_column(SQL_Error& error, const char *str, size_t) {
 		try {
-			columns+=new String(str, length, true);
+			columns+=new String(str, true);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
@@ -1110,7 +1123,7 @@ void unmarshal_bind_updates(HashStringVa
 				value=VVoid::get();
 			else
 				if(ph->value)
-					value=new VString(*new String(ph->value, 0, true/*tainted*/));
+					value=new VString(*new String(ph->value, true/*tainted*/));
 				else
 					value=new VString(*new String());					
 			hash.put(ph->name, value);