--- parser3/src/classes/table.C	2008/04/07 15:14:32	1.240
+++ 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/07 15:14:32 $";
+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
@@ -389,6 +389,8 @@ static void _load(Request& r, MethodPara
 	GET_SELF(r, VTable).set_table(table);
 }
 
+#ifdef NO_STRINGSTREAM
+
 void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
 	if(encloser) {
 		to<<*sencloser;
@@ -409,6 +411,8 @@ void maybe_enclose( String& to, const St
 		to<<from;
 }
 
+#else
+
 void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
 	if(encloser) {
 		to<<encloser;
@@ -429,8 +433,9 @@ void maybe_enclose( ostringstream& to, c
 		to<<from.cstr();
 }
 
-/*
-static void _save_old(Request& r, MethodParams& params) {
+#endif
+
+static void _save(Request& r, MethodParams& params) {
 	const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
 	size_t param_index=1;
 
@@ -446,6 +451,10 @@ static void _save_old(Request& r, Method
 		--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()) {
@@ -471,6 +480,8 @@ static void _save_old(Request& r, Method
 
 	Table& table=GET_SELF(r, VTable).table();
 
+#ifdef NO_STRINGSTREAM
+
 	String sdata;
 	if(output_column_names) {
 		if(table.columns()) { // named table
@@ -508,56 +519,13 @@ static void _save_old(Request& r, Method
 	// 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
 	}
-}
-*/
-
-static void _save(Request& r, MethodParams& params) {
-	const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
-	size_t param_index=1;
-
-	bool do_append=false;
-	bool output_column_names=true;
-
-	// mode?
-	if(first_arg=="append")
-		do_append=true;
-	else if(first_arg=="nameless")
-		output_column_names=false;
-	else
-		--param_index;
-
-	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
-
-	TableSeparators separators;
-	if(param_index<params.count()) {
-		Value& voptions=params.as_no_junction(param_index++, "additional params must be hash");
-		if( voptions.is_defined() && !voptions.is_string() ) {
-			if(HashStringValue* options=voptions.get_hash()) {
-				int valid_options=separators.load(*options);
-				if(valid_options!=options->count())
-					throw Exception(PARSER_RUNTIME,
-						0,
-						"invalid option passed");
-			} else {
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"additional params must be hash (did you spell mode parameter correctly?)");
-			}
-		}
-	}
-	if(param_index<params.count())
-		throw Exception(PARSER_RUNTIME,
-			0,
-			"bad mode (must be nameless or append)");
-
-	Table& table=GET_SELF(r, VTable).table();
 
-#ifndef NO_STRINGSTREAM
+#else
 
 	ostringstream ost(stringstream::out);
 
@@ -602,55 +570,11 @@ 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);
 	}
 
-#else
-
-	String sdata;
-	if(output_column_names) {
-		if(table.columns()) { // named table
-			for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
-				maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser );
-				if(i.has_next())
-					sdata<<*separators.scolumn;
-			}
-		} else { // nameless table [we were asked to output column names]
-			if(int lsize=table.count()?table[0]->count():0)
-				for(int column=0; column<lsize; column++) {
-					char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];
-					sdata.append_know_length(cindex_tab, 
-						snprintf(cindex_tab, MAX_NUMBER, 
-							column<lsize-1?"%d%c":"%d", column, separators.column),
-							String::L_CLEAN);
-				}
-			else
-				sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
-		}
-		sdata.append_know_length("\n", 1, String::L_CLEAN);
-	}
-
-	// data lines
-	Array_iterator<ArrayString*> i(table);
-	while(i.has_next()) {
-		for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
-			maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );
-			if(c.has_next())
-				sdata<<*separators.scolumn;
-		}
-		sdata.append_know_length("\n", 1, String::L_CLEAN);
-	}
-
-	// write
-	{
-		const char* data_cstr=sdata.cstr();
-		file_write(r.absolute(file_name), 
-			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
-	}
 #endif
 }
 
@@ -703,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)
@@ -743,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(); ) {
@@ -763,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
@@ -783,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,
@@ -1184,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*/));
@@ -1198,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");