parser3/src/classes/table.C - diff

Return to table.C CVS log

Up to [parser3project] / parser3 / src / classes

Diff for /parser3/src/classes/table.C between versions 1.90 and 1.142

version 1.90, 2001/07/07 16:38:01	version 1.142, 2002/02/07 11:55:30
Line 2	Line 2
Parser: @b table parser class.	Parser: @b table parser class.

Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)

Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)	$Id$
*/	*/
static const char *RCSId="$Id$";

#include "pa_config_includes.h"

#include "pcre.h"

#include "classes.h"	#include "classes.h"
#include "pa_common.h"	#include "pa_common.h"
Line 17 static const char *RCSId="$Id$";	Line 13 static const char *RCSId="$Id$";
#include "pa_vtable.h"	#include "pa_vtable.h"
#include "pa_vint.h"	#include "pa_vint.h"
#include "pa_sql_connection.h"	#include "pa_sql_connection.h"
#include "pa_dir.h"
#include "pa_vbool.h"	#include "pa_vbool.h"

// defines	// defines
Line 39 public: // Methoded	Line 34 public: // Methoded

// methods	// methods

static void _set(Request& r, const String& method_name, MethodParams *params) {	static void _create(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
// data is last parameter	// clone?
Value& vdata=params->as_junction(params->size()-1, "body must be code");	if(params->size()==1)
	if(const Table *source=params->get(0).get_table()) {
	static_cast<VTable >(r.self)->set_table(new(pool) Table(*source));
	return;
	}

	// data is last parameter
Temp_lang temp_lang(r, String::UL_PASS_APPENDED);	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
const String& data=r.process(vdata).as_string();	const String& data=
	r.process(params->as_junction(params->size()-1, "body must be code")).as_string();

size_t pos_after=0;	size_t pos_after=0;
// parse columns	// parse columns
Line 56 static void _set(Request& r, const Strin	Line 57 static void _set(Request& r, const Strin
columns=new(pool) Array(pool);	columns=new(pool) Array(pool);

Array head(pool);	Array head(pool);
data.split(head, &pos_after, "\n", 1, String::UL_CLEAN, 1);	data.split(head, &pos_after, "\n", 1, String::UL_AS_IS, 1);
if(head.size())	if(head.size())
head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_CLEAN);	head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_AS_IS);
}	}

Table& table=*new(pool) Table(pool, &method_name, columns);	Table& table=*new(pool) Table(pool, &method_name, columns);
// parse cells	// parse cells
Array rows(pool);	Array rows(pool);
data.split(rows, &pos_after, "\n", 1, String::UL_CLEAN);	data.split(rows, &pos_after, "\n", 1, String::UL_AS_IS);
int size=rows.quick_size();	Array_iter i(rows);
for(int i=0; i<size; i++) {	while(i.has_next()) {
Array& row=*new(pool) Array(pool);	Array& row=*new(pool) Array(pool);
const String& string=*rows.quick_get_string(i);	const String& string=*i.next_string();
// remove empty lines	// remove comment lines
if(!string.size())	if(!string.size())
continue;	continue;

string.split(row, 0, "\t", 1, String::UL_CLEAN);	string.split(row, 0, "\t", 1, String::UL_AS_IS);
table+=&row;	table+=&row;
}	}

Line 84 static void _set(Request& r, const Strin	Line 85 static void _set(Request& r, const Strin
static void _load(Request& r, const String& method_name, MethodParams *params) {	static void _load(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
// filename is last parameter	// filename is last parameter
Value& vfilename=params->as_no_junction(params->size()-1,	Value& vfile_name=params->as_no_junction(params->size()-1,
"file name must not be code");	"file name must not be code");

// loading text	// loading text
char *data=file_read_text(pool, r.absolute(vfilename.as_string()));	char *data=file_read_text(pool, r.absolute(vfile_name.as_string()));

// parse columns	// parse columns
Array *columns;	Array *columns;
Line 98 static void _load(Request& r, const Stri	Line 99 static void _load(Request& r, const Stri
uint line=origin.line;	uint line=origin.line;
#endif	#endif
if(params->size()==2) {	if(params->size()==2) {
columns=0;	columns=0; // nameless
} else {	} else {
columns=new(pool) Array(pool);	columns=new(pool) Array(pool);

if(char *row_chars=getrow(&data))	while(char *row_chars=getrow(&data)) {
	// remove empty&comment lines
	if(!row_chars \|\| row_chars == '#')
	continue;
do {	do {
String *name=new(pool) String(pool);	String *name=new(pool) String(pool);
name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++);	name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++);
*columns+=name;	*columns+=name;
} while(row_chars);	} while(row_chars);

	break;
	}
}	}

// parse cells	// parse cells
Table& table=*new(pool) Table(pool, &method_name, columns);	Table& table=*new(pool) Table(pool, &method_name, columns);
char *row_chars;	char *row_chars;
while(row_chars=getrow(&data)) {	while(row_chars=getrow(&data)) {
if(!*row_chars) // remove empty lines	// remove empty&comment lines
	if(!row_chars \|\| row_chars == '#')
continue;	continue;
Array *row=new(pool) Array(pool);	Array *row=new(pool) Array(pool);
while(char *cell_chars=lsplit(&row_chars, '\t')) {	while(char *cell_chars=lsplit(&row_chars, '\t')) {
Line 122 static void _load(Request& r, const Stri	Line 130 static void _load(Request& r, const Stri
cell->APPEND_TAINTED(cell_chars, 0, file, line);	cell->APPEND_TAINTED(cell_chars, 0, file, line);
*row+=cell;	*row+=cell;
}	}
	#ifndef NO_STRING_ORIGIN
line++;	line++;
	#endif
table+=row;	table+=row;
};	};

Line 130 static void _load(Request& r, const Stri	Line 140 static void _load(Request& r, const Stri
static_cast<VTable *>(r.self)->set_table(table);	static_cast<VTable *>(r.self)->set_table(table);
}	}

	/// @todo "z\nz" "zzz""zz"
static void _save(Request& r, const String& method_name, MethodParams *params) {	static void _save(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Value& vtable_name=params->as_no_junction(params->size()-1,	Value& vfile_name=params->as_no_junction(params->size()-1,
"file name must not be code");	"file name must not be code");

Table& table=static_cast<VTable *>(r.self)->table();	Table& table=static_cast<VTable *>(r.self)->table();

	bool do_append=false;
String sdata(pool);	String sdata(pool);
if(params->size()==1) { // not nameless=named output	if(params->size()==1) { // named output
// write out names line	// write out names line
if(table.columns()) { // named table	if(table.columns()) { // named table
for(int column=0; column<table.columns()->size(); column++) {	Array_iter i(*table.columns());
if(column)	while(i.has_next()) {
sdata.APPEND_CONST("\t");	sdata.append(i.next_string(), //static_cast<String *>(table.columns()->quick_get(column)),
sdata.append(static_cast<String >(table.columns()->quick_get(column)),
String::UL_TABLE);	String::UL_TABLE);
	if(i.has_next())
	sdata.APPEND_CONST("\t");
}	}
} else { // nameless table	} else { // nameless table
int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0;	if(int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0)
if(lsize)
for(int column=0; column<lsize; column++) {	for(int column=0; column<lsize; column++) {
char cindex_tab=(char )malloc(MAX_NUMBER);	char cindex_tab=(char )pool.malloc(MAX_NUMBER);
snprintf(cindex_tab, MAX_NUMBER, "%d\t", column);	snprintf(cindex_tab, MAX_NUMBER, "%d\t", column);
sdata.APPEND_CONST(cindex_tab);	sdata.APPEND_CONST(cindex_tab);
}	}
Line 159 static void _save(Request& r, const Stri	Line 171 static void _save(Request& r, const Stri
sdata.APPEND_CONST("empty nameless table");	sdata.APPEND_CONST("empty nameless table");
}	}
sdata.APPEND_CONST("\n");	sdata.APPEND_CONST("\n");
	} else { // mode specified
	const String& mode=params->as_string(0, "mode must be string");
	if(mode=="append")
	do_append=true;
	else if(mode=="nameless")
	/ok, already skipped names output/;
	else
	throw Exception(0, 0,
	&mode,
	"unknown mode, must be 'append'");

}	}
// data lines	// data lines
for(int index=0; index<table.size(); index++) {	Array_iter i(table);
Array row=static_cast<Array >(table.quick_get(index));	while(i.has_next()) {
for(int column=0; column<row->size(); column++) {	Array_iter c(static_cast<Array >(i.next()));
if(column)	while(c.has_next()) {
sdata.APPEND_CONST("\t");	sdata.append(c.next_string(), //static_cast<String *>(row->quick_get(column)),
sdata.append(static_cast<String >(row->quick_get(column)),
String::UL_TABLE);	String::UL_TABLE);
	if(c.has_next())
	sdata.APPEND_CONST("\t");
}	}
sdata.APPEND_CONST("\n");	sdata.APPEND_CONST("\n");
}	}

// write	// write
file_write(pool, r.absolute(vtable_name.as_string()),	file_write(r.absolute(vfile_name.as_string()),
sdata.cstr(), sdata.size(), true);	sdata.cstr(), sdata.size(), true, do_append);
}	}

static void _count(Request& r, const String&, MethodParams *) {	static void _count(Request& r, const String& method_name, MethodParams *) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Value& value=new(pool) VInt(pool, static_cast<VTable >(r.self)->table().size());	Value& value=new(pool) VInt(pool, static_cast<VTable >(r.self)->table().size());
	value.set_name(method_name);
r.write_no_lang(value);	r.write_no_lang(value);
}	}

static void _line(Request& r, const String& method_name, MethodParams *) {	static void _line(Request& r, const String& method_name, MethodParams *) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Value& value=new(pool) VInt(pool, 1+static_cast<VTable >(r.self)->table().current());	Value& value=new(pool) VInt(pool, 1+static_cast<VTable >(r.self)->table().current());
	value.set_name(method_name);
r.write_no_lang(value);	r.write_no_lang(value);
}	}

Line 193 static void _offset(Request& r, const St	Line 219 static void _offset(Request& r, const St
Pool& pool=r.pool();	Pool& pool=r.pool();
Table& table=static_cast<VTable *>(r.self)->table();	Table& table=static_cast<VTable *>(r.self)->table();
if(params->size()) {	if(params->size()) {
Value& offset_expr=params->as_junction(0, "offset must be expression");	bool absolute=false;
table.shift(r.process(offset_expr).as_int());	if(params->size()>1) {
	const String& whence=params->as_string(0, "whence must be string");
	if(whence=="cur")
	absolute=false;
	else if(whence=="set")
	absolute=true;
	else
	throw Exception(0, 0,
	&whence,
	"is invalid whence, valid are 'cur' or 'set'");
	}

	Value& offset_expr=params->as_junction(params->size()-1, "offset must be expression");
	table.offset(absolute, r.process(offset_expr).as_int());
} else {	} else {
Value& value=*new(pool) VInt(pool, table.current());	Value& value=*new(pool) VInt(pool, table.current());
	value.set_name(method_name);
r.write_no_lang(value);	r.write_no_lang(value);
}	}
}	}
Line 204 static void _offset(Request& r, const St	Line 244 static void _offset(Request& r, const St
static void _menu(Request& r, const String& method_name, MethodParams *params) {	static void _menu(Request& r, const String& method_name, MethodParams *params) {
Value& body_code=params->as_junction(0, "body must be code");	Value& body_code=params->as_junction(0, "body must be code");

Value *delim_code=params->size()==2?&params->get(1):0;	Value *delim_maybe_code=params->size()>1?&params->get(1):0;

VTable& vtable=static_cast<VTable >(r.self);	VTable& vtable=static_cast<VTable >(r.self);
Table& table=vtable.table();	Table& table=vtable.table();
bool need_delim=false;	bool need_delim=false;
vtable.lock(); int saved_current=table.current();	int saved_current=table.current();
for(int row=0; row<table.size(); row++) {	int size=table.size();
	for(int row=0; row<size; row++) {
table.set_current(row);	table.set_current(row);

Value& processed_body=r.process(body_code);	Value& processed_body=r.process(body_code);
if(delim_code) { // delimiter set?	if(delim_maybe_code) { // delimiter set?
const String *string=processed_body.get_string();	const String *string=processed_body.get_string();
if(need_delim && string && string->size()) // need delim & iteration produced string?	if(need_delim && string && string->size()) // need delim & iteration produced string?
r.write_pass_lang(r.process(*delim_code));	r.write_pass_lang(r.process(*delim_maybe_code));
need_delim=true;	need_delim=true;
}	}
r.write_pass_lang(processed_body);	r.write_pass_lang(processed_body);
}	}
table.set_current(saved_current); vtable.unlock();	table.set_current(saved_current);
}	}

static void _empty(Request& r, const String& method_name, MethodParams *params) {	#ifndef DOXYGEN
Pool& pool=r.pool();
Table& table=static_cast<VTable *>(r.self)->table();

r.write_no_lang(*new(pool) VBool(pool, table.size()==0));
}

/// used by table: _record / store_column_item_to_hash
struct Record_info {
Pool *pool;
Table *table;
Hash *hash;
};
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);
Value *value;
if(const String *column_item=ri.table->item(column_name))
value=new(ri.pool) VString(column_item);
else
value=new(ri.pool) VVoid(ri.pool);
ri.hash->put(column_name, value);
}
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& 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 {	struct Row_info {
Table *table;	Table *table;
int key_field;	int key_field;
Array *value_fields;	Array *value_fields;
Hash *hash;	Hash *hash;
};	};
	#endif
static void table_row_to_hash(Array::Item value, void info) {	static void table_row_to_hash(Array::Item value, void info) {
Array& row=static_cast<Array >(value);	Array& row=static_cast<Array >(value);
Row_info& ri=static_cast<Row_info >(info);	Row_info& ri=static_cast<Row_info >(info);
Line 274 static void table_row_to_hash(Array::Ite	Line 281 static void table_row_to_hash(Array::Ite

if(ri.key_field<row.size()) {	if(ri.key_field<row.size()) {
VHash& result=*new(pool) VHash(pool);	VHash& result=*new(pool) VHash(pool);
Hash& hash=*result.get_hash();	Hash& hash=*result.get_hash(0);
for(int i=0; i<ri.value_fields->size(); i++) {	for(int i=0; i<ri.value_fields->size(); i++) {
int value_field=ri.value_fields->get_int(i);	int value_field=ri.value_fields->get_int(i);
if(value_field<row.size())	if(value_field<row.size())
hash.put(	hash.put(
*ri.table->columns()->get_string(value_field),	*ri.table->columns()->get_string(value_field),
new(pool) VString(*row.get_string(value_field)));	new(pool) VString(*row.get_string(value_field)));
}	}

Line 287 static void table_row_to_hash(Array::Ite	Line 294 static void table_row_to_hash(Array::Ite
}	}
}	}
static void _hash(Request& r, const String& method_name, MethodParams *params) {	static void _hash(Request& r, const String& method_name, MethodParams *params) {
Table& table=static_cast<VTable *>(r.self)->table();	Pool& pool=r.pool();
if(const Array *columns=table.columns())	Table& self_table=static_cast<VTable *>(r.self)->table();
	Value& result=*new(pool) VHash(pool);
	if(const Array *columns=self_table.columns())
if(columns->size()>1) {	if(columns->size()>1) {
Pool& pool=r.pool();

const String& key_field_name=params->as_no_junction(0,	const String& key_field_name=params->as_no_junction(0,
"key field name must not be code").as_string();	"key field name must not be code").as_string();
int key_field=table.column_name2index(key_field_name, true);	int key_field=self_table.column_name2index(key_field_name, true);
int value_fields_count=params->size()-1;
bool value_fields_by_params=value_fields_count!=0;	Array value_fields(pool);
if(!value_fields_by_params)	if(params->size()>1) {
value_fields_count=columns->size()-1; // all columns except key	Value& value_fields_param=params->as_no_junction(1, "value field(s) must not be code");
Array value_fields(pool, value_fields_count);	if(value_fields_param.is_string()) {
if(value_fields_by_params) {	value_fields+=self_table.column_name2index(value_fields_param.as_string(), true);
for(int i=1; i<params->size(); i++) {	} else if(Table *value_fields_table=value_fields_param.get_table()) {
const String& value_field_name=params->as_no_junction(i,	for(int i=0; i<value_fields_table->size(); i++) {
"value field name must not be code").as_string();	const String& value_field_name=
value_fields+=table.column_name2index(value_field_name, true);	static_cast<Array >(value_fields_table->get(i))->get_string(0);
}	value_fields+=self_table.column_name2index(value_field_name, true);
} else { // by all columns except key	}
	} else
	throw Exception(0, 0,
	&method_name,
	"value field(s) must be string or self_table"
	);
	} else { // by all columns, including key
for(int i=0; i<columns->size(); i++)	for(int i=0; i<columns->size(); i++)
if(i!=key_field)	value_fields+=i;
value_fields+=i;
}	}

// integers: key_field & value_fields	// integers: key_field & value_fields
Value& result=*new(pool) VHash(pool);	Row_info row_info={&self_table, key_field, &value_fields, result.get_hash(0)};
Row_info row_info={&table, key_field, &value_fields, result.get_hash()};	self_table.for_each(table_row_to_hash, &row_info);
table.for_each(table_row_to_hash, &row_info);
result.set_name(method_name);
r.write_no_lang(result);
}	}
	result.set_name(method_name);
	r.write_no_lang(result);
}	}

/// used by table: _sort / sort_cmp_string\|sort_cmp_double	#ifndef DOXYGEN
struct Table_seq_item {	struct Table_seq_item {
Array *row;	Array *row;
union {	union {
Line 329 struct Table_seq_item {	Line 340 struct Table_seq_item {
double d;	double d;
} value;	} value;
};	};
	#endif
static int sort_cmp_string(const void a, const void b) {	static int sort_cmp_string(const void a, const void b) {
return strcmp(	return strcmp(
static_cast<const Table_seq_item *>(a)->value.c_str,	static_cast<const Table_seq_item *>(a)->value.c_str,
Line 346 static int sort_cmp_double(const void *a	Line 358 static int sort_cmp_double(const void *a
return 0;	return 0;
}	}
static void _sort(Request& r, const String& method_name, MethodParams *params) {	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");	Value& key_maker=params->as_junction(0, "key-maker must be code");

bool reverse=params->size()==2/..[asc\|desc]/?	bool reverse=params->size()>1/..[desc\|asc\|]/?
reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc":	reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc":
false;	false; // default=asc

Table& table=static_cast<VTable *>(r.self)->table();	Table& old_table=static_cast<VTable *>(r.self)->table();
	Table& new_table=*new(pool) Table(pool, &method_name, old_table.columns());
// anything to sort?
if(!table.size())
return;

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;	int i;

// calculate key values	// calculate key values
bool key_values_are_strings=true;	bool key_values_are_strings=true;
for(i=0; i<table.size(); i++) {	// save 'current'
table.set_current(i);	int saved_current=old_table.current();
	for(i=0; i<old_table.size(); i++) {
	old_table.set_current(i);
// calculate key value	// 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*/);	Value& value=r.process(key_maker).as_expr_result(true/return string as-is*/);
if(i==0) // determining key values type by first one	if(i==0) // determining key values type by first one
key_values_are_strings=value.is_string();	key_values_are_strings=value.is_string();
Line 376 static void _sort(Request& r, const Stri	Line 388 static void _sort(Request& r, const Stri
else	else
seq[i].value.d=value.as_double();	seq[i].value.d=value.as_double();
}	}
	// restore 'current'
	old_table.set_current(saved_current);
// sort keys	// 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);	key_values_are_strings?sort_cmp_string:sort_cmp_double);

// reorder table as they require in 'seq'	// reorder table as they require in 'seq'
for(i=0; i<table.size(); i++)	for(i=0; i<old_table.size(); i++)
table.put(i, seq[reverse?table.size()-1-i:i].row);	new_table+=seq[reverse?old_table.size()-1-i:i].row;

// reset 'current'	// replace any previous table value
table.set_current(0);	static_cast<VTable *>(r.self)->set_table(new_table);
}	}

static void _locate(Request& r, const String& method_name, MethodParams *params) {	static void _locate(Request& r, const String& method_name, MethodParams *params) {
Line 394 static void _locate(Request& r, const St	Line 408 static void _locate(Request& r, const St
VTable& vtable=static_cast<VTable >(r.self);	VTable& vtable=static_cast<VTable >(r.self);
Table& table=vtable.table();	Table& table=vtable.table();
Value& result=*new(pool) VBool(pool, table.locate(	Value& result=*new(pool) VBool(pool, table.locate(
params->get(0).as_string(),	params->as_string(0, "column name must be string"),
params->get(1).as_string()));	params->as_string(1, "value must be string")
	));
result.set_name(method_name);	result.set_name(method_name);
r.write_no_lang(result);	r.write_no_lang(result);
}	}
Line 412 static void _flip(Request& r, const Stri	Line 427 static void _flip(Request& r, const Stri
Array& new_row=*new(pool) Array(pool, old_table.size());	Array& new_row=*new(pool) Array(pool, old_table.size());
for(int i=0; i<old_table.size(); i++) {	for(int i=0; i<old_table.size(); i++) {
const Array& old_row=old_table.at(i);	const Array& old_row=old_table.at(i);
new_row+=column<old_row.size()?old_row.get(column):empty_string;	new_row+=column<old_row.size()?old_row.get(column):new(pool) String(pool);
}	}
new_table+=&new_row;	new_table+=&new_row;
}	}

vtable.set_table(new_table);	r.write_no_lang(*new(pool) VTable(pool, &new_table));
}	}

static void _append(Request& r, const String& method_name, MethodParams *params) {	static void _append(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
// data is last parameter	// data
	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
const String& string=	const String& string=
r.process(params->as_junction(0, "body must be code")).as_string();	r.process(params->as_junction(0, "body must be code")).as_string();

// parse cells	// parse cells
Array& row=*new(pool) Array(pool);	Array& row=*new(pool) Array(pool);
string.split(row, 0, "\t", 1, String::UL_CLEAN);	string.split(row, 0, "\t", 1, String::UL_AS_IS);

VTable& vtable=static_cast<VTable >(r.self);	VTable& vtable=static_cast<VTable >(r.self);
// disable ^a.menu{^a.append[]}
vtable.lock();
vtable.table()+=&row;	vtable.table()+=&row;
vtable.unlock();
}	}

static void _join(Request& r, const String& method_name, MethodParams *params) {	static void _join(Request& r, const String& method_name, MethodParams *params) {
Line 442 static void _join(Request& r, const Stri	Line 455 static void _join(Request& r, const Stri

Table *maybe_src=params->as_no_junction(0, "table ref must not be code").get_table();	Table *maybe_src=params->as_no_junction(0, "table ref must not be code").get_table();
if(!maybe_src)	if(!maybe_src)
PTHROW(0, 0,	throw Exception(0, 0,
&method_name,	&method_name,
"source is not a table");	"source is not a table");

Table& src=*maybe_src;	Table& src=*maybe_src;
Table& dest=static_cast<VTable *>(r.self)->table();	Table& dest=static_cast<VTable *>(r.self)->table();
if(&src == &dest)	if(&src == &dest)
PTHROW(0, 0,	throw Exception(0, 0,
&method_name,	&method_name,
"source and destination are same table");	"source and destination are same table");

if(const Array *dest_columns=dest.columns()) { // dest is named	if(const Array *dest_columns=dest.columns()) { // dest is named
Line 458 static void _join(Request& r, const Stri	Line 471 static void _join(Request& r, const Stri
for(int src_row=0; src_row<src.size(); src_row++) {	for(int src_row=0; src_row<src.size(); src_row++) {
src.set_current(src_row);	src.set_current(src_row);
Array& dest_row=*new(pool) Array(pool);	Array& dest_row=*new(pool) Array(pool);
for(int dest_column=0; dest_column<dest_columns->size(); dest_column++)	for(int dest_column=0; dest_column<dest_columns->size(); dest_column++) {
dest_row+=src.item(*dest_columns->get_string(dest_column));	const String src_item=src.item(dest_columns->get_string(dest_column));
	dest_row+=src_item?src_item:new(pool) String(pool);
	}
dest+=&dest_row;	dest+=&dest_row;
}	}
src.set_current(saved_src_current);	src.set_current(saved_src_current);
Line 469 static void _join(Request& r, const Stri	Line 484 static void _join(Request& r, const Stri
}	}
}	}

	#ifndef DOXYGEN
	class Table_sql_event_handlers : public SQL_Driver_query_event_handlers {
	public:
	Table_sql_event_handlers(Pool& apool, const String& amethod_name,
	const String& astatement_string, const char *astatement_cstr) :
	pool(apool),
	method_name(amethod_name),
	statement_string(astatement_string),
	statement_cstr(astatement_cstr),
	columns(*new(pool) Array(pool)),
	row(0),
	table(0)
	{
	}

	void add_column(void *ptr, size_t size) {
	String *column=new(pool) String(pool);
	column->APPEND_TAINTED(
	(const char *)ptr, size,
	statement_cstr, 0);
	columns+=column;
	}
	void before_rows() {
	table=new(pool) Table(pool, &method_name, &columns);
	}
	void add_row() {
	(*table)+=(row=new(pool) Array(pool));
	}
	void add_row_cell(void *ptr, size_t size) {
	String *cell=new(pool) String(pool);
	if(size)
	cell->APPEND_TAINTED(
	(const char *)ptr, size,
	statement_cstr, table->size()-1);
	(*row)+=cell;
	}

	private:
	Pool& pool;
	const String& method_name;
	const String& statement_string; const char *statement_cstr;
	Array& columns;
	Array *row;
	public:
	Table *table;
	};
	#endif
static void _sql(Request& r, const String& method_name, MethodParams *params) {	static void _sql(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();

if(!r.connection)
PTHROW(0, 0,
&method_name,
"without connect");

Value& statement=params->as_junction(0, "statement must be code");	Value& statement=params->as_junction(0, "statement must be code");

ulong limit=0;	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;	ulong offset=0;
if(params->size()>2) {	if(params->size()>1) {
Value& offset_code=params->as_junction(2, "offset must be expression");	Value& voptions=params->as_no_junction(1, "options must be hash, not code");
offset=(ulong)r.process(offset_code).as_double();	if(voptions.is_defined())
	if(Hash *options=voptions.get_hash(&method_name)) {
	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
	throw Exception(0, 0,
	&method_name,
	"options must be hash");
}	}

Temp_lang temp_lang(r, String::UL_SQL);	Temp_lang temp_lang(r, String::UL_SQL);
const String& statement_string=r.process(statement).as_string();	const String& statement_string=r.process(statement).as_string();
const char *statement_cstr=	const char *statement_cstr=
statement_string.cstr(String::UL_UNSPECIFIED, r.connection);	statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
unsigned int sql_column_count; SQL_Driver::Cell *sql_columns;	Table_sql_event_handlers handlers(pool, method_name,
unsigned long sql_row_count; SQL_Driver::Cell **sql_rows;	statement_string, statement_cstr);
bool need_rethrow=false; Exception rethrow_me;	try {
PTRY {	#ifdef RESOURCES_DEBUG
r.connection->query(	struct timeval mt[2];
statement_cstr, offset, limit,	//measure:before
&sql_column_count, &sql_columns,	gettimeofday(&mt[0],NULL);
&sql_row_count, &sql_rows);	#endif
}	r.connection(&method_name)->query(
PCATCH(e) { // query problem	statement_cstr, offset, limit,
rethrow_me=e; need_rethrow=true;	handlers);
}
PEND_CATCH
if(need_rethrow)
PTHROW(rethrow_me.type(), rethrow_me.code(),
&statement_string, // setting more specific source [were url]
rethrow_me.comment());

Array& table_columns=*new(pool) Array(pool);	#ifdef RESOURCES_DEBUG
for(unsigned int i=0; i<sql_column_count; i++) {	//measure:after connect
String& table_column=*new(pool) String(pool);	gettimeofday(&mt[1],NULL);
table_column.APPEND_TAINTED(
(const char *)sql_columns[i].ptr, sql_columns[i].size,	double t[2];
statement_cstr, 0);	for(int i=0;i<2;i++)
table_columns+=&table_column;	t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0;
}
	r.sql_request_time+=t[1]-t[0];
Table& table=*new(pool) Table(pool, &method_name, &table_columns);	#endif
	} catch(const Exception& e) { // query problem
for(unsigned long row=0; row<sql_row_count; row++) {	// more specific source [were url]
SQL_Driver::Cell *sql_cells=sql_rows[row];	throw Exception(e.type(), e.code(),
Array& table_row=*new(pool) Array(pool);	&statement_string,
	"%s", e.comment());
for(unsigned int i=0; i<sql_column_count; i++) {	}
String& table_cell=*new(pool) String(pool);
if(sql_cells[i].size)	Table *result=
table_cell.APPEND_TAINTED(	handlers.table?handlers.table: // query resulted in table? return it
(const char *)sql_cells[i].ptr, sql_cells[i].size,	new(pool) Table(pool, &method_name, 0); // query returned no table, fake it
statement_cstr, row);
table_row+=&table_cell;
}
table+=&table_row;
}

// replace any previous table value
static_cast<VTable *>(r.self)->set_table(table);
}

static void _dir(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();

Value& relative_path=params->as_no_junction(0, "path must not be code");

const String *regexp;
pcre *regexp_code;
int ovecsize;
int *ovector;
if(params->size()>1) {
regexp=&params->as_no_junction(1, "regexp must not be code").as_string();

const char *pattern=regexp->cstr(String::UL_AS_IS);
const char *errptr;
int erroffset;
regexp_code=pcre_compile(pattern, PCRE_EXTRA \| PCRE_DOTALL,
&errptr, &erroffset,
r.pcre_tables);

if(!regexp_code)
PTHROW(0, 0,
&regexp->mid(erroffset, regexp->size()),
"regular expression syntax error - %s", errptr);

ovector=(int )malloc(sizeof(int)(ovecsize=(1/match/)*3));
} else
regexp_code=0;


const char* absolute_path_cstr=r.absolute(relative_path.as_string())
.cstr(String::UL_FILE_NAME);

Array& columns=*new(pool) Array(pool);
columns+=new(pool) String(pool, "name");
Table& table=*new(pool) Table(pool, &method_name, &columns);

LOAD_DIR(absolute_path_cstr,
size_t file_name_size=strlen(ffblk.ff_name);
bool suits=true;
if(regexp_code) {
int exec_result=pcre_exec(regexp_code, 0,
ffblk.ff_name, file_name_size, 0,
0, ovector, ovecsize);

if(exec_result==PCRE_ERROR_NOMATCH)
suits=false;
else if(exec_result<0) {
(*pcre_free)(regexp_code);
PTHROW(0, 0,
regexp,
"regular expression execute (%d)",
exec_result);
}
}

if(suits) {
char file_name_cstr=(char )r.malloc(file_name_size);
memcpy(file_name_cstr, ffblk.ff_name, file_name_size);
String &file_name=*new(pool) String(pool);
file_name.APPEND(file_name_cstr, file_name_size, String::UL_FILE_NAME,
method_name.origin().file, method_name.origin().line);

Array& row=*new(pool) Array(pool);
row+=&file_name;
table+=&row;
}
);

if(regexp_code)
(*pcre_free)(regexp_code);

// replace any previous table value	// replace any previous table value
static_cast<VTable *>(r.self)->set_table(table);	static_cast<VTable >(r.self)->set_table(result);
}	}

static void _columns(Request& r, const String& method_name, MethodParams *) {	static void _columns(Request& r, const String& method_name, MethodParams *) {
Line 627 static void _columns(Request& r, const S	Line 602 static void _columns(Request& r, const S

Table& source_table=static_cast<VTable *>(r.self)->table();	Table& source_table=static_cast<VTable *>(r.self)->table();
if(const Array *source_columns=source_table.columns()) {	if(const Array *source_columns=source_table.columns()) {
int size=source_columns->quick_size();	Array_iter i(*source_columns);
for(int i=0; i<size; i++) {	while(i.has_next()) {
Array& result_row=*new(pool) Array(pool);	Array& result_row=*new(pool) Array(pool);
result_row+=source_columns->quick_get(i);	result_row+=i.next();
result_table+=&result_row;	result_table+=&result_row;
}	}
}	}
Line 645 static void _columns(Request& r, const S	Line 620 static void _columns(Request& r, const S
MTable::MTable(Pool& apool) : Methoded(apool) {	MTable::MTable(Pool& apool) : Methoded(apool) {
set_name(*NEW String(pool(), TABLE_CLASS_NAME));	set_name(*NEW String(pool(), TABLE_CLASS_NAME));

// ^table:set{data}	// ^table::create{data}
// ^table:set[nameless]{data}	// ^table::create[nameless]{data}
add_native_method("set", Method::CT_DYNAMIC, _set, 1, 2);	// ^table::create[table]
	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 2);
	// old name for compatibility with <= v 1.141 2002/01/25 11:33:45 paf
	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 2);

// ^table:load[file]	// ^table::load[file]
// ^table:load[nameless;file]	// ^table::load[nameless;file]
add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);

// ^table.save[file]	// ^table.save[file]
Line 664 MTable::MTable(Pool& apool) : Methoded(a	Line 642 MTable::MTable(Pool& apool) : Methoded(a
add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0);	add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0);

// ^table.offset[]	// ^table.offset[]
// ^table.offset[offset]	// ^table.offset(offset)
add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 1);	// ^table.offset[cur\|set](offset)
	add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 2);

// ^table.menu{code}	// ^table.menu{code}
// ^table.menu{code}[delim]	// ^table.menu{code}[delim]
add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2);	add_native_method("menu", Method::CT_DYNAMIC, _menu, 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]
// ^table:hash[key field name][value field name;...]	// ^table:hash[key field name][value field name(s) string/table]
add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 1000);	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 2);

// ^table.sort{string-key-maker} ^table.sort{string-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)[asc\|desc]	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc\|asc]
add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);	add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);

// ^table.locate[field;value]	// ^table.locate[field;value]
Line 698 MTable::MTable(Pool& apool) : Methoded(a	Line 671 MTable::MTable(Pool& apool) : Methoded(a
add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1);	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1);


// ^table:sql[query][(count[;offset])]	// ^table:sql[query]
add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3);	// ^table:sql[query][$.limit(1) $.offset(2)]
	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
// ^table:dir[path]
// ^table:dir[path][regexp]
add_native_method("dir", Method::CT_DYNAMIC, _dir, 1, 2);

// ^table:columns[]	// ^table:columns[]
add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 0);	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 0);

E-mail:

Removed from v.1.90
changed lines
	Added in v.1.142