--- parser3/src/classes/table.C	2001/05/08 10:23:50	1.78
+++ parser3/src/classes/table.C	2001/07/02 14:03:35	1.89
@@ -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.78 2001/05/08 10:23:50 paf Exp $
 */
+static const char *RCSId="$Id: table.C,v 1.89 2001/07/02 14:03:35 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -195,7 +194,7 @@ static void _offset(Request& r, const St
 	Table& table=static_cast<VTable *>(r.self)->table();
 	if(params->size()) {
 		Value& offset_expr=params->get_junction(0, "offset must be expression");
-		table.shift((int)r.process(offset_expr).as_double());
+		table.shift(r.process(offset_expr).as_int());
 	} else {
 		Value& value=*new(pool) VInt(pool, table.current());
 		r.write_no_lang(value);
@@ -246,7 +245,7 @@ static void store_column_item_to_hash(Ar
 	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 *) {
@@ -505,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
@@ -525,20 +524,19 @@ 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);
+	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);
+			if(sql_cells[i].size)
 				table_cell.APPEND_TAINTED(
 					(const char *)sql_cells[i].ptr, sql_cells[i].size,
-					statement_cstr, r);
-				table_row+=&table_cell;
-			}
-			table+=&table_row;
+					statement_cstr, row);
+			table_row+=&table_cell;
 		}
+		table+=&table_row;
 	}
 
 	// replace any previous table value
@@ -620,6 +618,28 @@ static void _dir(Request& r, const Strin
 	static_cast<VTable *>(r.self)->set_table(table);
 }
 
+static void _columns(Request& r, const String& method_name, MethodParams *) {
+	Pool& pool=r.pool();
+
+	Array& result_columns=*new(pool) Array(pool);
+	result_columns+=new(pool) String(pool, "column");
+	Table& result_table=*new(pool) Table(pool, &method_name, &result_columns);
+
+	Table& source_table=static_cast<VTable *>(r.self)->table();
+	if(const Array *source_columns=source_table.columns()) {
+		int size=source_columns->quick_size();
+		for(int i=0; i<size; i++) {
+			Array& result_row=*new(pool) Array(pool);
+			result_row+=source_columns->quick_get(i);
+			result_table+=&result_row;
+		}
+	}
+
+	VTable& result=*new(pool) VTable(pool, &result_table);
+	result.set_name(method_name);
+	r.write_no_lang(result);
+}
+
 // constructor
 
 MTable::MTable(Pool& apool) : Methoded(apool) {
@@ -657,10 +677,8 @@ MTable::MTable(Pool& apool) : Methoded(a
 	// ^table.record[]
 	add_native_method("record", Method::CT_DYNAMIC, _record, 0, 0);
 
-	/** @fn _hash
-		^table:hash[key field name]
-		^table:hash[key field name][value field name;...]
-	*/
+	// ^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]
@@ -686,6 +704,9 @@ MTable::MTable(Pool& apool) : Methoded(a
 	// ^table:dir[path]
 	// ^table:dir[path][regexp]
 	add_native_method("dir", Method::CT_DYNAMIC, _dir, 1, 2);
+
+	// ^table:columns[]
+	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 0);
 }
 
 // global variable