--- parser3/src/classes/table.C	2008/06/26 15:00:42	1.244
+++ parser3/src/classes/table.C	2009/04/16 01:10:21	1.249
@@ -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/06/26 15:00:42 $";
+static const char * const IDENT_TABLE_C="$Date: 2009/04/16 01:10:21 $";
 
 #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
@@ -947,7 +951,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));
 }
 
 
@@ -1103,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*/));
@@ -1129,13 +1133,8 @@ static void _sql(Request& r, MethodParam
 					bind=vbind->get_hash();
 				}
 				if(Value* vlimit=options->get(sql_limit_name)) {
-					if(vlimit->is_defined()){
-						valid_options++;
-						limit=(ulong)r.process_to_value(*vlimit).as_double();
-					} else
-						throw Exception(PARSER_RUNTIME,
-								0,
-								"limit must be defined");
+					valid_options++;
+					limit=(ulong)r.process_to_value(*vlimit).as_double();
 				}
 				if(Value* voffset=options->get(sql_offset_name)) {
 					valid_options++;