--- parser3/src/classes/table.C	2001/03/26 10:36:52	1.30
+++ parser3/src/classes/table.C	2001/03/27 14:50:44	1.32
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.30 2001/03/26 10:36:52 paf Exp $
+	$Id: table.C,v 1.32 2001/03/27 14:50:44 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -110,9 +110,45 @@ static void _save(Request& r, const Stri
 	lfile_name.append(vfile_name->as_string(),
 		String::UL_FILE_NAME, true);
 
-	static_cast<VTable *>(r.self)->table().save(
-		params->size()==2/*nameless save*/, 
-		r.absolute(lfile_name));
+	Table& table=static_cast<VTable *>(r.self)->table();
+
+	String sdata(pool);
+	if(params->size()==1) { // not nameless=named output
+		// write out names line
+		if(table.columns()) { // named table
+			for(int column=0; column<table.columns()->size(); column++) {
+				if(column)
+					sdata.APPEND_CONST("\t");
+				sdata.append(*static_cast<String *>(table.columns()->quick_get(column)), 
+					String::UL_TABLE);
+			}
+		} else { // nameless table
+			int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0;
+			if(lsize)
+				for(int column=0; column<lsize; column++) {
+					char *cindex_tab=(char *)malloc(MAX_NUMBER);
+					snprintf(cindex_tab, MAX_NUMBER, "%d\t", column);
+					sdata.APPEND_CONST(cindex_tab);
+				}
+			else
+				sdata.APPEND_CONST("empty nameless table");
+		}
+		sdata.APPEND_CONST("\n");
+	}
+	// data lines
+	for(int index=0; index<table.size(); index++) {
+		Array *row=static_cast<Array *>(table.quick_get(index));
+		for(int column=0; column<row->size(); column++) {
+			if(column)
+				sdata.APPEND_CONST("\t");
+			sdata.append(*static_cast<String *>(row->quick_get(column)), 
+				String::UL_TABLE);
+		}
+		sdata.APPEND_CONST("\n");
+	}
+
+	// write
+	file_write(pool, r.absolute(lfile_name), sdata.cstr(), sdata.size(), true);
 }
 
 static void _count(Request& r, const String&, Array *) {
@@ -205,6 +241,45 @@ static void _record(Request& r, const St
 	}
 }
 
+struct Order_item {
+	int index;
+	Value *value;
+};
+static void _sort(Request& r, const String& method_name, Array *params) {
+	Value& key_maker=*(Value *)params->get(0);
+	// forcing ^sort{this} ^sort(or this) param type
+	r.fail_if_junction_(false, key_maker, method_name, "key-maker must be junction");
+
+	bool reverse;
+	if(params->size()==2) { // ..[asc|desc]
+		Value& order=*(Value *)params->get(1);
+		// forcing ..[this param-type]
+		r.fail_if_junction_(false, order, method_name, "order must not be junction");
+		reverse=order.as_string()=="asc";
+	} else
+		reverse=false;
+
+	// calculating key values
+	Table& table=static_cast<VTable *>(r.self)->table();
+	Order_item *order=(Order_item *)malloc(sizeof(Order_item)*table.size());
+	Order_item *current=order;
+	for(int i=0; i<table.size(); i++) {
+		table.set_current(i);
+		// todo: think about rcontext! must be VTable, could be not
+		// calculate key value
+		current->index=i;
+		current->value=&r.process(key_maker);
+		current++;
+	}
+	// sort keys
+	//\ todo
+
+	// reorder table as they require in 'order'
+	//\ todo
+
+	table.set_current(0);
+}
+
 // initialize
 
 void initialize_table_class(Pool& pool, VStateless_class& vclass) {
@@ -241,4 +316,8 @@ void initialize_table_class(Pool& pool,
 	// ^table.record[]
 	vclass.add_native_method("record", _record, 0, 0);
 
+	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[asc|desc]
+	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[asc|desc]
+	vclass.add_native_method("sort", _sort, 1, 2);
+
 }