--- parser3/src/classes/table.C	2008/05/27 19:01:46	1.243
+++ parser3/src/classes/table.C	2009/05/13 07:36:05	1.253
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2008/05/27 19:01:46 $";
+static const char * const IDENT_TABLE_C="$Date: 2009/05/13 07:36:05 $";
 
 #ifndef NO_STRINGSTREAM
 #include <sstream>
@@ -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;
@@ -344,7 +344,7 @@ static void _load(Request& r, MethodPara
 	}
 
 	// loading text
-	char *data=file_read_text(r.charsets,
+	char *data=file_load_text(r,
 		r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)),
 		true,
 		options
@@ -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);
 			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);
 		if(sr.delim=='\n') {
 			table+=row;
 			row=new ArrayString(columns_count);
@@ -451,6 +451,10 @@ static void _save(Request& r, MethodPara
 		--param_index;
 
 	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
+	String file_spec=r.absolute(file_name);
+
+	if(do_append && file_exist(file_spec))
+		output_column_names=false;
 
 	TableSeparators separators;
 	if(param_index<params.count()) {
@@ -515,7 +519,7 @@ static void _save(Request& r, MethodPara
 	// write
 	{
 		const char* data_cstr=sdata.cstr();
-		file_write(r.absolute(file_name), 
+		file_write(file_spec, 
 			data_cstr, sdata.length(), true, do_append);
 		if(*data_cstr) // not empty (when empty it's not heap memory)
 			pa_free((void*)data_cstr); // not needed anymore
@@ -566,9 +570,9 @@ static void _save(Request& r, MethodPara
 	// write
 	{
 		string data=ost.str();
-		const char* data_cstr = data.c_str();
+		const char* data_cstr=data.c_str();
 
-		file_write(r.absolute(file_name), data_cstr, data.length(), true /* as text */, do_append);
+		file_write(file_spec, data_cstr, data.length(), true /* as text */, do_append);
 	}
 
 #endif
@@ -615,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);
 }
@@ -947,7 +964,7 @@ static void _locate(Request& r, MethodPa
 	bool result=params[0].get_junction()?
 		_locate_expression(table, o, r, params) :
 		_locate_name_value(table, o, r, params);
-	r.write_no_lang(*new VBool(result));
+	r.write_no_lang(VBool::get(result));
 }
 
 
@@ -1030,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");
@@ -1103,10 +1120,10 @@ void unmarshal_bind_updates(HashStringVa
 		if(ph->were_updated) {
 			Value* value;
 			if(ph->is_null)
-				value=new VVoid();
+				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);
@@ -1117,7 +1134,7 @@ static void _sql(Request& r, MethodParam
 	Value& statement=params.as_junction(0, "statement must be code");
 
 	HashStringValue* bind=0;
-	ulong limit=0;
+	ulong limit=SQL_NO_LIMIT;
 	ulong offset=0;
 	if(params.count()>1) {
 		Value& voptions=params.as_no_junction(1, "options must be hash, not code");