--- parser3/src/classes/table.C	2001/08/03 11:54:19	1.99
+++ parser3/src/classes/table.C	2001/08/10 07:13:07	1.103
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: table.C,v 1.99 2001/08/03 11:54:19 parser Exp $"; 
+static const char *RCSId="$Id: table.C,v 1.103 2001/08/10 07:13:07 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -437,27 +437,27 @@ static int sort_cmp_double(const void *a
 		return 0;
 }
 static void _sort(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
 	Value& key_maker=params->as_junction(0, "key-maker must be code");
 
-	bool reverse=params->size()==2/*..[asc|desc]*/?
+	bool reverse=params->size()==2/*..[desc|asc|]*/?
 		reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc":
-		false;
-
-	Table& table=static_cast<VTable *>(r.self)->table();
+		true;
 
-	// anything to sort?
-	if(!table.size())
-		return;
+	Table& old_table=static_cast<VTable *>(r.self)->table();
+	Table& new_table=*new(pool) Table(pool, &method_name, old_table.columns());
 
-	Table_seq_item *seq=(Table_seq_item *)malloc(sizeof(Table_seq_item)*table.size());
+	Table_seq_item *seq=(Table_seq_item *)pool.malloc(sizeof(Table_seq_item)*old_table.size());
 	int i;
 
 	// calculate key values
 	bool key_values_are_strings=true;
-	for(i=0; i<table.size(); i++) {
-		table.set_current(i);
+	// save 'current'
+	int saved_current=old_table.current();
+	for(i=0; i<old_table.size(); i++) {
+		old_table.set_current(i);
 		// calculate key value
-		seq[i].row=(MethodParams *)table.get(i);
+		seq[i].row=(MethodParams *)old_table.get(i);
 		Value& value=*r.process(key_maker).as_expr_result(true/*return string as-is*/);
 		if(i==0) // determining key values type by first one
 			key_values_are_strings=value.is_string();
@@ -467,16 +467,17 @@ static void _sort(Request& r, const Stri
 		else
 			seq[i].value.d=value.as_double();
 	}
+	// restore 'current'
+	old_table.set_current(saved_current);
 	// sort keys
-	_qsort(seq, table.size(), sizeof(Table_seq_item), 
+	_qsort(seq, old_table.size(), sizeof(Table_seq_item), 
 		key_values_are_strings?sort_cmp_string:sort_cmp_double);
 
 	// reorder table as they require in 'seq'
-	for(i=0; i<table.size(); i++)
-		table.put(i, seq[reverse?table.size()-1-i:i].row);
+	for(i=0; i<old_table.size(); i++)
+		new_table+=seq[reverse?old_table.size()-1-i:i].row;
 
-	// reset 'current'
-	table.set_current(0);
+	r.write_no_lang(*new(pool) VTable(pool, &new_table));
 }
 
 static void _locate(Request& r, const String& method_name, MethodParams *params) {
@@ -616,15 +617,18 @@ static void _sql(Request& r, const Strin
 	Value& statement=params->as_junction(0, "statement must be code");
 
 	ulong limit=0;
-	if(params->size()>1) {
-		Value& limit_code=params->as_junction(1, "limit must be expression");
-		limit=(uint)r.process(limit_code).as_double();
-	}
-
 	ulong offset=0;
-	if(params->size()>2) {
-		Value& offset_code=params->as_junction(2, "offset must be expression");
-		offset=(ulong)r.process(offset_code).as_double();
+	if(params->size()>1) {
+		Value& options_param=params->as_no_junction(1, "options must be hash, not code");
+		if(Hash *options=options_param.get_hash()) {
+			if(Value *vlimit=(Value *)options->get(*sql_limit_name))
+				limit=(ulong)r.process(*vlimit).as_double();
+			if(Value *voffset=(Value *)options->get(*sql_offset_name))
+				offset=(ulong)r.process(*voffset).as_double();
+		} else
+			PTHROW(0, 0,
+				&method_name,
+				"options must be hash");
 	}
 
 	Temp_lang temp_lang(r, String::UL_SQL);
@@ -795,8 +799,8 @@ MTable::MTable(Pool& apool) : Methoded(a
 	// ^table:hash[key field name][value field name;...]
 	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 1000);
 
-	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[asc|desc]
-	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[asc|desc]
+	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc]
+	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc|asc]
 	add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);
 
 	// ^table.locate[field;value]
@@ -812,8 +816,9 @@ MTable::MTable(Pool& apool) : Methoded(a
 	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1);
 
 
-	// ^table:sql[query][(count[;offset])]
-	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3);
+	// ^table:sql[query]
+	// ^table:sql[query][$.limit(1) $.offset(2)]
+	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
 
 	// ^table:dir[path]
 	// ^table:dir[path][regexp]