--- parser3/src/classes/table.C	2006/04/09 13:38:47	1.221
+++ parser3/src/classes/table.C	2007/04/23 10:30:10	1.226
@@ -5,7 +5,10 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2006/04/09 13:38:47 $";
+static const char * const IDENT_TABLE_C="$Date: 2007/04/23 10:30:10 $";
+
+#include <sstream>
+using namespace std;
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -91,7 +94,7 @@ static Table::Action_options get_action_
 			if(soffset == "cur")
 				result.offset=source.current();
 			else
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					&soffset,
 					"must be 'cur' string or expression");
 		} else 
@@ -109,7 +112,7 @@ static Table::Action_options get_action_
 	} 
 
 	if(valid_options!=options->count())
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"called with invalid option");
 
@@ -119,7 +122,7 @@ static void check_option_param(bool opti
 			  MethodParams& params, size_t next_param_index,
 			  const char *msg) {
 	if(next_param_index+(options_defined?1:0) != params.count())
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"%s", msg);
 }
@@ -145,7 +148,7 @@ static void _create(Request& r, MethodPa
 	if(params.count()==2) {
 		const String& snameless=params.as_string(0, "called with two params, first param may only be string 'nameless'");
 		if(snameless!="nameless")
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				&snameless,
 				"table::create called with two params, first param may only be 'nameless'");
 		columns=Table::columns_type(0); // nameless
@@ -277,7 +280,7 @@ struct TableSeparators {
 		if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
 			scolumn=&vseparator->as_string();
 			if(scolumn->length()!=1)
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					scolumn,
 					"separator must be one character long");
 			column=scolumn->first_char();
@@ -286,7 +289,7 @@ struct TableSeparators {
 		if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
 			sencloser=&vencloser->as_string();
 			if(sencloser->length()!=1)
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					sencloser,
 					"encloser must be one character long");
 			encloser=sencloser->first_char();
@@ -359,7 +362,7 @@ static void _load(Request& r, MethodPara
 	GET_SELF(r, VTable).set_table(table);
 }
 
-static void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
+void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
 	if(encloser) {
 		to<<*sencloser;
 		// while we have 'encloser'...
@@ -379,8 +382,28 @@ static void maybe_enclose( String& to, c
 		to<<from;
 }
 
+void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
+	if(encloser) {
+		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).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).cstr();
 
-static void _save(Request& r, MethodParams& params) {
+		to<<encloser;
+	} else
+		to<<from.cstr();
+}
+
+
+static void _save_old(Request& r, MethodParams& params) {
 	const String& first_arg=params.as_string(0, "first argument must not be code");
 	size_t param_index=1;
 
@@ -399,20 +422,23 @@ static void _save(Request& r, MethodPara
 
 	TableSeparators separators;
 	if(param_index<params.count()) {
-		if(HashStringValue *options=params.as_no_junction(param_index++, "additional params must be hash").get_hash()) {
-			int valid_options=separators.load(*options);
-			if(valid_options!=options->count())
-				throw Exception("parser.runtime",
+		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,
-					"invalid option passed");
-		} else
-			throw Exception("parser.runtime",
-				0,
-				"additional params must be hash (did you spell mode parameter correctly?)");
-		
+					"additional params must be hash (did you spell mode parameter correctly?)");
+			}
+		}
 	}
 	if(param_index<params.count())
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"bad mode (must be nameless or append)");
 
@@ -462,6 +488,96 @@ static void _save(Request& r, MethodPara
 	}
 }
 
+static void _save(Request& r, MethodParams& params) {
+	const String& first_arg=params.as_string(0, "first argument 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();
+
+	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( 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++) {
+					if(separators.encloser) {
+						ost<<separators.encloser<<column<<separators.encloser;
+					} else {
+					ost<<column;
+					}
+					if(column<lsize-1){
+						ost<<separators.column;
+					}
+				}
+			else
+				ost<<"empty nameless table";
+		}
+		ost<<'\n';
+	}
+
+	// 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( ost, *c.next(), separators.encloser );
+			if(c.has_next())
+				ost<<separators.column;
+		}
+		ost<<'\n';
+	}
+
+	// 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);
+	}
+}
+
 static void _count(Request& r, MethodParams&) {
 	int result=GET_SELF(r, VTable).table().count();
 	r.write_no_lang(*new VInt(result));
@@ -483,7 +599,7 @@ static void _offset(Request& r, MethodPa
 		    else if(whence=="set")
 				absolute=true;
 		    else
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					&whence,
 					"is invalid whence, valid are 'cur' or 'set'");
 		}
@@ -611,20 +727,21 @@ static void _hash(Request& r, MethodPara
 							if(sdistinct=="tables")
 								distinct=D_TABLES;
 							else
-								throw Exception("parser.runtime",
+								throw Exception(PARSER_RUNTIME,
 									&sdistinct,
 									"must be 'tables' or true/false");
 						} else
 							distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL;
 					}
+
 					if(valid_options!=options->count())
-						throw Exception("parser.runtime",
+						throw Exception(PARSER_RUNTIME,
 							0,
 							"called with invalid option");
 				}
 			}
 			if(param_index==2) // bad options param type
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					0,
 					"options must be hash");
 
@@ -647,10 +764,10 @@ static void _hash(Request& r, MethodPara
 							+=self_table.column_name2index(value_field_name, true);
 					}
 				} else
-					throw Exception("parser.runtime",
+					throw Exception(PARSER_RUNTIME,
 						0,
-						"value field(s) must be string or table"
-					);
+						"value field(s) must be string or table");
+
 			} else { // by all columns, including key
 				if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
 					for(size_t i=0; i<columns->count(); i++)
@@ -835,7 +952,7 @@ static void join_nameless_row(Table& src
 static void _join(Request& r, MethodParams& params) {
 	Table* maybe_src=params.as_no_junction(0, "table ref must not be code").get_table();
 	if(!maybe_src)
-		throw Exception("parser.runtime", 
+		throw Exception(PARSER_RUNTIME, 
 			0, 
 			"source is not a table");
 	Table& src=*maybe_src;
@@ -846,7 +963,7 @@ static void _join(Request& r, MethodPara
 
 	Table& dest=GET_SELF(r, VTable).table();
 	if(&src == &dest)
-		throw Exception("parser.runtime", 
+		throw Exception(PARSER_RUNTIME, 
 			0, 
 			"source and destination are same table");
 
@@ -975,11 +1092,11 @@ static void _sql(Request& r, MethodParam
 					offset=(ulong)r.process_to_value(*voffset).as_double();
 				}
 				if(valid_options!=options->count())
-					throw Exception("parser.runtime",
+					throw Exception(PARSER_RUNTIME,
 						0,
 						"called with invalid option");
 			} else
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					0,
 					"options must be hash");
 	}
@@ -1086,6 +1203,8 @@ MTable::MTable(): Methoded("table") {
 	// ^table.save[nameless;file]
 	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 3);
 
+	// add_native_method("save_old", Method::CT_DYNAMIC, _save_old, 1, 3);
+
 	// ^table.count[]
 	add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0);