--- parser3/src/classes/table.C	2001/05/07 13:29:47	1.71
+++ parser3/src/classes/table.C	2001/06/28 07:44:17	1.86
@@ -4,9 +4,8 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: table.C,v 1.71 2001/05/07 13:29:47 paf Exp $
 */
+static const char *RCSId="$Id: table.C,v 1.86 2001/06/28 07:44:17 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -19,6 +18,7 @@
 #include "pa_vint.h"
 #include "pa_sql_connection.h"
 #include "pa_dir.h"
+#include "pa_vbool.h"
 
 // defines
 
@@ -192,9 +192,10 @@ static void _line(Request& r, const Stri
 static void _offset(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	Table& table=static_cast<VTable *>(r.self)->table();
-	if(params->size())
-		table.shift((int)r.process(params->get(0)).as_double());
-	else {
+	if(params->size()) {
+		Value& offset_expr=params->get_junction(0, "offset must be expression");
+		table.shift(r.process(offset_expr).as_int());
+	} else {
 		Value& value=*new(pool) VInt(pool, table.current());
 		r.write_no_lang(value);
 	}
@@ -225,11 +226,10 @@ static void _menu(Request& r, const Stri
 }
 
 static void _empty(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
 	Table& table=static_cast<VTable *>(r.self)->table();
-	if(table.size()==0)
-		r.write_pass_lang(r.process(params->get(0)));
-	else if(params->size()>1)
-		r.write_pass_lang(r.process(params->get(1)));
+	
+	r.write_no_lang(*new(pool) VBool(pool, table.size()==0));
 }
 
 /// used by table: _record / store_column_item_to_hash
@@ -241,27 +241,88 @@ struct Record_info {
 static void store_column_item_to_hash(Array::Item *item, void *info) {
 	Record_info& ri=*static_cast<Record_info *>(info);
 	String& column_name=*static_cast<String *>(item);
-	const String *column_item=ri.table->item(column_name);
 	Value *value;
-	if(column_item)
+	if(const String *column_item=ri.table->item(column_name))
 		value=new(*ri.pool) VString(*column_item);
 	else
-		value=new(*ri.pool) VUnknown(*ri.pool);
+		value=new(*ri.pool) VVoid(*ri.pool);
 	ri.hash->put(column_name, value);
 }
-static void _record(Request& r, const String& method_name, MethodParams *params) {
+static void _record(Request& r, const String& method_name, MethodParams *) {
 	Table& table=static_cast<VTable *>(r.self)->table();
 	if(const Array *columns=table.columns()) {
 		Pool& pool=r.pool();
-		Value& value=*new(pool) VHash(pool);
-		Record_info record_info={&pool, &table, value.get_hash()};
+		Value& result=*new(pool) VHash(pool);
+		Record_info record_info={&pool, &table, result.get_hash()};
 		columns->for_each(store_column_item_to_hash, &record_info);
+		result.set_name(method_name);
+		r.write_no_lang(result);
+	}
+}
+
+/// used by table: _hash / table_row_to_hash
+struct Row_info {
+	Table *table;
+	int key_field;
+	Array *value_fields;
+	Hash *hash;
+};
+static void table_row_to_hash(Array::Item *value, void *info) {
+	Array& row=*static_cast<Array *>(value);
+	Row_info& ri=*static_cast<Row_info *>(info);
+	Pool& pool=ri.table->pool();
+
+	if(ri.key_field<row.size()) {
+		VHash& result=*new(pool) VHash(pool);
+		Hash& hash=*result.get_hash();
+		for(int i=0; i<ri.value_fields->size(); i++) {
+			int value_field=ri.value_fields->get_int(i);
+			if(value_field<row.size())
+				hash.put(
+					*ri.table->columns()->get_string(value_field),
+					new(pool) VString(*row.get_string(value_field)));
+		}
 		
-		r.write_no_lang(value);
+		ri.hash->put(*row.get_string(ri.key_field), &result);
 	}
 }
+static void _hash(Request& r, const String& method_name, MethodParams *params) {
+	Table& table=static_cast<VTable *>(r.self)->table();
+	if(const Array *columns=table.columns()) 
+		if(columns->size()>1) {
+			Pool& pool=r.pool();
+
+			const String& key_field_name=params->get_no_junction(0, 
+				"key field name must not be code").as_string();
+			int key_field=table.column_name2index(key_field_name, true);
+			int value_fields_count=params->size()-1;
+			bool value_fields_by_params=value_fields_count!=0;
+			if(!value_fields_by_params)
+				value_fields_count=columns->size()-1; // all columns except key
+			Array value_fields(pool, value_fields_count);
+			if(value_fields_by_params) {
+				for(int i=1; i<params->size(); i++) {
+					const String& value_field_name=params->get_no_junction(i,
+						"value field name must not be code").as_string();
+					value_fields+=table.column_name2index(value_field_name, true);
+				}
+			} else { // by all columns except key
+				for(int i=0; i<columns->size(); i++)
+					if(i!=key_field)
+						value_fields+=i;
+			}
+
+			// integers: key_field & value_fields
+			Value& result=*new(pool) VHash(pool);
+			Row_info row_info={&table, key_field, &value_fields, result.get_hash()};
+			table.for_each(table_row_to_hash, &row_info);
+			result.set_name(method_name);
+			r.write_no_lang(result);
+		}
+}
 
-struct Seq_item {
+/// used by table: _sort / sort_cmp_string|sort_cmp_double
+struct Table_seq_item {
 	Array *row;
 	union {
 		char *c_str;
@@ -270,13 +331,13 @@ struct Seq_item {
 };
 static int sort_cmp_string(const void *a, const void *b) {
 	return strcmp(
-		static_cast<const Seq_item *>(a)->value.c_str, 
-		static_cast<const Seq_item *>(b)->value.c_str
+		static_cast<const Table_seq_item *>(a)->value.c_str, 
+		static_cast<const Table_seq_item *>(b)->value.c_str
 	);
 }
 static int sort_cmp_double(const void *a, const void *b) {
-	double va=static_cast<const Seq_item *>(a)->value.d;
-	double vb=static_cast<const Seq_item *>(b)->value.d;
+	double va=static_cast<const Table_seq_item *>(a)->value.d;
+	double vb=static_cast<const Table_seq_item *>(b)->value.d;
 	if(va<vb)
 		return -1;
 	else if(va>vb)
@@ -297,7 +358,7 @@ static void _sort(Request& r, const Stri
 	if(!table.size())
 		return;
 
-	Seq_item *seq=(Seq_item *)malloc(sizeof(Seq_item)*table.size());
+	Table_seq_item *seq=(Table_seq_item *)malloc(sizeof(Table_seq_item)*table.size());
 	int i;
 
 	// calculate key values
@@ -316,7 +377,7 @@ static void _sort(Request& r, const Stri
 			seq[i].value.d=value.as_double();
 	}
 	// sort keys
-	_qsort(seq, table.size(), sizeof(Seq_item), 
+	_qsort(seq, table.size(), sizeof(Table_seq_item), 
 		key_values_are_strings?sort_cmp_string:sort_cmp_double);
 
 	// reorder table as they require in 'seq'
@@ -328,18 +389,15 @@ static void _sort(Request& r, const Stri
 }
 
 static void _locate(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
 	VTable& vtable=*static_cast<VTable *>(r.self);
 	Table& table=vtable.table();
-	vtable.last_locate_was_successful=table.locate(
+	Value& result=*new(pool) VBool(pool, table.locate(
 		params->get(0).as_string(),
-		params->get(1).as_string());
-}
-
-static void _found(Request& r, const String& method_name, MethodParams *params) {
-	if(static_cast<VTable *>(r.self)->last_locate_was_successful)
-		r.write_pass_lang(r.process(params->get_junction(0, "found-parameter must be code")));
-	else if(params->size()==2)
-		r.write_pass_lang(r.process(params->get_junction(0, "else-parameter must be code")));
+		params->get(1).as_string()));
+	result.set_name(method_name);
+	r.write_no_lang(result);
 }
 
 static void _flip(Request& r, const String& method_name, MethodParams *params) {
@@ -446,7 +504,7 @@ static void _sql(Request& r, const Strin
 			&sql_column_count, &sql_columns,
 			&sql_row_count, &sql_rows);
 	}
-	PCATCH(e) { // connect/process problem
+	PCATCH(e) { // query problem
 		rethrow_me=e;  need_rethrow=true;
 	}
 	PEND_CATCH
@@ -466,20 +524,18 @@ static void _sql(Request& r, const Strin
 
 	Table& table=*new(pool) Table(pool, &method_name, &table_columns);
 
-	{
-		for(unsigned long r=0; r<sql_row_count; r++) {
-			SQL_Driver::Cell *sql_cells=sql_rows[r];
-			Array& table_row=*new(pool) Array(pool);
-			
-			for(unsigned int i=0; i<sql_column_count; i++) {
-				String& table_cell=*new(pool) String(pool);
-				table_cell.APPEND_TAINTED(
-					(const char *)sql_cells[i].ptr, sql_cells[i].size,
-					statement_cstr, r);
-				table_row+=&table_cell;
-			}
-			table+=&table_row;
+	for(unsigned long row=0; row<sql_row_count; row++) {
+		SQL_Driver::Cell *sql_cells=sql_rows[row];
+		Array& table_row=*new(pool) Array(pool);
+		
+		for(unsigned int i=0; i<sql_column_count; i++) {
+			String& table_cell=*new(pool) String(pool);
+			table_cell.APPEND_TAINTED(
+				(const char *)sql_cells[i].ptr, sql_cells[i].size,
+				statement_cstr, row);
+			table_row+=&table_cell;
 		}
+		table+=&table_row;
 	}
 
 	// replace any previous table value
@@ -592,22 +648,22 @@ MTable::MTable(Pool& apool) : Methoded(a
 	// ^table.menu{code}[delim]
 	add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2);
 
-	// ^table.empty{code-when-empty}  
-	// ^table.empty{code-when-empty}{code-when-not}
-	add_native_method("empty", Method::CT_DYNAMIC, _empty, 1, 2);
+	// ^table.empty[]
+	add_native_method("empty", Method::CT_DYNAMIC, _empty, 0, 0);
 
 	// ^table.record[]
 	add_native_method("record", Method::CT_DYNAMIC, _record, 0, 0);
 
+	// ^table:hash[key field name]
+	// ^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]
 	add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);
 
 	// ^table.locate[field;value]
 	add_native_method("locate", Method::CT_DYNAMIC, _locate, 2, 2);
-	// ^table.found{when-found}
-	// ^table.found{when-found}{when-not-found}
-	add_native_method("found", Method::CT_DYNAMIC, _found, 1, 2);
 
 	// ^table.flip[]
 	add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0);