--- parser3/src/classes/table.C	2008/04/08 12:34:01	1.241
+++ parser3/src/classes/table.C	2009/04/15 04:50:48	1.248
@@ -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/04/08 12:34:01 $";
+static const char * const IDENT_TABLE_C="$Date: 2009/04/15 04:50:48 $";
 
 #ifndef NO_STRINGSTREAM
 #include <sstream>
@@ -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
@@ -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
@@ -623,12 +627,15 @@ static void _menu(Request& r, MethodPara
 
 		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));
-			need_delim=true;
+			else
+				need_delim=true;
 		}
+
 		r.write_pass_lang(sv_processed);
 
 		if(lskip==Request::SKIP_BREAK)
@@ -663,15 +670,13 @@ static void table_row_to_hash(Table::ele
 	if(!key)
 		return; // ignore rows without key [too-short-record_array if-indexed]
 		
-	bool exist = false;
-	switch (info->value_type) {
-	case C_STRING:
-		{
+	bool exist=false;
+	switch(info->value_type) {
+		case C_STRING: {
 			exist=info->hash->put_dont_replace(*key, new VString(*row->get(info->value_fields->get(0))));
+			break;
 		}
-		break;
-	case C_HASH:
-		{
+		case C_HASH: {
 			VHash* vhash=new VHash;
 			HashStringValue& hash=vhash->hash();
 			for(Array_iterator<int> i(*info->value_fields); i.has_next(); ) {
@@ -683,18 +688,16 @@ static void table_row_to_hash(Table::ele
 			}
 
 			exist=info->hash->put_dont_replace(*key, vhash);
+			break;
 		}
-		break;
-	case C_TABLE:
-		{
-			VTable* vtable=(VTable*)info->hash->get(*key); // put. table existed?
-			if( info->distinct==D_ILLEGAL ){
-				exist=true;
-				break;
-			}
-
+		case C_TABLE: {
+			VTable* vtable=(VTable*)info->hash->get(*key); // table exist?
 			Table* table;
 			if(vtable) {
+				if(info->distinct==D_ILLEGAL) {
+					exist=true;
+					break;
+				}
 				table=vtable->get_table();
 			} else {
 				// no? creating table of same structure as source
@@ -703,8 +706,8 @@ static void table_row_to_hash(Table::ele
 				info->hash->put(*key, new VTable(table));
 			}
 			*table+=row;
+			break;
 		}
-		break;
 	}
 	if(exist && info->distinct==D_ILLEGAL)
 		throw Exception(PARSER_RUNTIME,
@@ -1104,7 +1107,7 @@ 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*/));
@@ -1118,7 +1121,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");