--- parser3/src/classes/table.C	2008/04/08 12:34:01	1.241
+++ parser3/src/classes/table.C	2009/08/31 12:55:01	1.266
@@ -1,13 +1,13 @@
 /** @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/08/31 12:55:01 $";
 
-#ifndef NO_STRINGSTREAM
+#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 #include <sstream>
 using namespace std;
 #endif
@@ -17,6 +17,7 @@ using namespace std;
 
 #include "pa_common.h"
 #include "pa_request.h"
+#include "pa_charsets.h"
 #include "pa_vtable.h"
 #include "pa_vint.h"
 #include "pa_sql_connection.h"
@@ -26,7 +27,7 @@ using namespace std;
 
 class MTable: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool&, HashStringValue&) { return new VTable(); }
+	Value* create_new_value(Pool&) { return new VTable(); }
 
 public:
 	MTable();
@@ -39,10 +40,6 @@ public: // Methoded
 
 DECLARE_CLASS_VAR(table, new MTable, 0);
 
-// externs
-
-extern String cycle_data_name;
-
 #define TABLE_REVERSE_NAME "reverse"
 
 // globals
@@ -130,7 +127,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 +227,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 +341,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 +356,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, String::L_TAINTED);
 			if(sr.delim=='\n') 
 				break;
 		}
@@ -374,7 +371,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, String::L_TAINTED);
 		if(sr.delim=='\n') {
 			table+=row;
 			row=new ArrayString(columns_count);
@@ -389,51 +386,51 @@ static void _load(Request& r, MethodPara
 	GET_SELF(r, VTable).set_table(table);
 }
 
-#ifdef NO_STRINGSTREAM
+#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 
-void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
+void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
 	if(encloser) {
-		to<<*sencloser;
+		to<<encloser;
 		// while we have 'encloser'...
 		size_t pos_after=0;
 		for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
 			pos_before++; // including first encloser (and skipping it for next pos)
-            to<<from.mid(pos_after, pos_before);
-			to<<*sencloser; // doubling encloser
+			to<<from.mid(pos_after, pos_before).cstr();
+			to<<encloser; // doubling encloser
 		}
 		// last piece
 		size_t from_length=from.length();
 		if(pos_after<from_length)
-			to<<from.mid(pos_after, from_length);
+			to<<from.mid(pos_after, from_length).cstr();
 
-		to<<*sencloser;
+		to<<encloser;
 	} else
-		to<<from;
+		to<<from.cstr();
 }
 
 #else
 
-void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
+void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
 	if(encloser) {
-		to<<encloser;
+		to<<*sencloser;
 		// while we have 'encloser'...
 		size_t pos_after=0;
 		for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
 			pos_before++; // including first encloser (and skipping it for next pos)
-            to<<from.mid(pos_after, pos_before).cstr();
-			to<<encloser; // doubling encloser
+			to<<from.mid(pos_after, pos_before);
+			to<<*sencloser; // doubling encloser
 		}
 		// last piece
 		size_t from_length=from.length();
 		if(pos_after<from_length)
-			to<<from.mid(pos_after, from_length).cstr();
+			to<<from.mid(pos_after, from_length);
 
-		to<<encloser;
+		to<<*sencloser;
 	} else
-		to<<from.cstr();
+		to<<from;
 }
 
-#endif
+#endif // don't use stringstream
 
 static void _save(Request& r, MethodParams& params) {
 	const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
@@ -451,6 +448,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()) {
@@ -476,102 +477,102 @@ static void _save(Request& r, MethodPara
 
 	Table& table=GET_SELF(r, VTable).table();
 
-#ifdef NO_STRINGSTREAM
+#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 
-	String sdata;
+	ostringstream ost(stringstream::out);
+
+	// process header
 	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;
+				maybe_enclose( ost, *i.next(), separators.encloser );
+				if(i.has_next()){
+					ost<<separators.column;
+				}
 			}
 		} 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);
+					if(separators.encloser) {
+						ost<<separators.encloser<<column<<separators.encloser;
+					} else {
+						ost<<column;
+					}
+					if(column<lsize-1){
+						ost<<separators.column;
+					}
 				}
 			else
-				sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
+				ost<<"empty nameless table";
 		}
-		sdata.append_know_length("\n", 1, String::L_CLEAN);
+		ost<<'\n';
 	}
 
-	// data lines
+	// process 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 );
+			maybe_enclose( ost, *c.next(), separators.encloser );
 			if(c.has_next())
-				sdata<<*separators.scolumn;
+				ost<<separators.column;
 		}
-		sdata.append_know_length("\n", 1, String::L_CLEAN);
+		ost<<'\n';
 	}
 
 	// 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
+		string data=ost.str();
+		const char* data_cstr=data.c_str();
+
+		file_write(file_spec, data_cstr, data.length(), true /* as text */, do_append);
 	}
 
 #else
 
-	ostringstream ost(stringstream::out);
-
-	// process header
+	String sdata;
 	if(output_column_names) {
 		if(table.columns()) { // named table
 			for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
-				maybe_enclose( ost, *i.next(), separators.encloser );
-				if(i.has_next()){
-					ost<<separators.column;
-				}
+				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++) {
-					if(separators.encloser) {
-						ost<<separators.encloser<<column<<separators.encloser;
-					} else {
-						ost<<column;
-					}
-					if(column<lsize-1){
-						ost<<separators.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
-				ost<<"empty nameless table";
+				sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
 		}
-		ost<<'\n';
+		sdata.append_know_length("\n", 1, String::L_CLEAN);
 	}
 
-	// process data lines
+	// data lines
 	Array_iterator<ArrayString*> i(table);
 	while(i.has_next()) {
 		for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
-			maybe_enclose( ost, *c.next(), separators.encloser );
+			maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );
 			if(c.has_next())
-				ost<<separators.column;
+				sdata<<*separators.scolumn;
 		}
-		ost<<'\n';
+		sdata.append_know_length("\n", 1, String::L_CLEAN);
 	}
 
 	// write
 	{
-		string data=ost.str();
-		const char* data_cstr = data.c_str();
-
-		file_write(r.absolute(file_name), data_cstr, data.length(), true /* as text */, do_append);
+		const char* data_cstr=sdata.cstr();
+		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
 	}
 
-#endif
+#endif // don't use stringstream
 }
 
 static void _count(Request& r, MethodParams&) {
@@ -607,32 +608,47 @@ static void _offset(Request& r, MethodPa
 }
 
 static void _menu(Request& r, MethodParams& params) {
-	Temp_hash_value<const String::Body, void*> 
-		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
+	InCycle temp(r);
 
 	Value& body_code=params.as_junction(0, "body must be code");
 	
 	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));
-			need_delim=true;
-		}
-		r.write_pass_lang(sv_processed);
+	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;
+			}
 
-		if(lskip==Request::SKIP_BREAK)
-			break;
+			r.write_pass_lang(sv_processed);
+
+			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);
 }
@@ -663,15 +679,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 +697,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 +715,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,
@@ -900,6 +912,14 @@ static void _sort(Request& r, MethodPara
 		else
 			seq[i].value.d=value.as_double();
 	}
+
+	// @todo: handle this elsewhere
+	if(r.charsets.source().NAME()=="KOI8-R" && key_values_are_strings) {
+		for(i=0; i<old_count; i++)
+			if(*seq[i].value.c_str)
+				seq[i].value.c_str=Charset::transcode(seq[i].value.c_str, r.charsets.source(), UTF8_charset).cstr();
+	}
+
 	// sort keys
 	_qsort(seq, old_count, sizeof(Table_seq_item), 
 		key_values_are_strings?sort_cmp_string:sort_cmp_double);
@@ -948,7 +968,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));
 }
 
 
@@ -970,9 +990,8 @@ static void _flip(Request& r, MethodPara
 }
 
 static void _append(Request& r, MethodParams& params) {
-	// data
 	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
-	const String& string=r.process_to_string(params.as_junction(0, "body must be code"));
+	const String& string=r.process_to_string(params[0]);
 
 	// parse cells
 	Table::element_type row=new ArrayString;
@@ -1033,7 +1052,7 @@ public:
 
 	bool add_column(SQL_Error& error, const char *str, size_t length) {
 		try {
-			columns+=new String(str, length, true);
+			columns+=new String(str, String::L_TAINTED, length);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
@@ -1061,10 +1080,7 @@ public:
 	}
 	bool add_row_cell(SQL_Error& error, const char* str, size_t length) {
 		try {
-			String& cell=*new String;
-			if(length)
-				cell.append_know_length(str, length, String::L_TAINTED);
-			*row+=&cell;
+			*row+=new String(str, String::L_TAINTED, length);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");
@@ -1081,7 +1097,7 @@ static void marshal_bind(
 {
 	SQL_Driver::Placeholder& ph=**pptr;
 	ph.name=aname.cstr();
-	ph.value=avalue->as_string().cstr(String::L_UNSPECIFIED);
+	ph.value=avalue->as_string().untaint_cstr(String::L_AS_IS);
 	ph.is_null=avalue->get_class()==void_class;
 	ph.were_updated=false;
 
@@ -1104,12 +1120,9 @@ 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*/));
-				else
-					value=new VString(*new String());					
+				value=new VString(*new String(ph->value, String::L_TAINTED));
 			hash.put(ph->name, value);
 		}
 }
@@ -1118,7 +1131,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");
@@ -1154,8 +1167,8 @@ static void _sql(Request& r, MethodParam
 
 	Temp_lang temp_lang(r, String::L_SQL);
 	const String&  statement_string=r.process_to_string(statement);
-	const char* statement_cstr=
-		statement_string.cstr(String::L_UNSPECIFIED, r.connection());
+	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
+
 	Table_sql_event_handlers handlers;
 #ifdef RESOURCES_DEBUG
 	struct timeval mt[2];