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.107 and 1.154

version 1.107, 2001/08/28 10:33:32	version 1.154, 2002/08/01 11:26:44
Line 1	Line 1
/** @file	/** @file
Parser: @b table parser class.	Parser: @b table parser class.

Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
*/	*/
static const char *RCSId="$Id$";
	static const char* IDENT_TABLE_C="$Id$";

#include "classes.h"	#include "classes.h"
#include "pa_config_includes.h"
#include "pa_common.h"	#include "pa_common.h"
#include "pa_request.h"	#include "pa_request.h"
#include "pa_vtable.h"	#include "pa_vtable.h"
Line 16 static const char *RCSId="$Id$";	Line 15 static const char *RCSId="$Id$";
#include "pa_sql_connection.h"	#include "pa_sql_connection.h"
#include "pa_vbool.h"	#include "pa_vbool.h"

// defines

#define TABLE_CLASS_NAME "table"

// class	// class

class MTable : public Methoded {	class MTable : public Methoded {
Line 35 public: // Methoded	Line 30 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_to_string(params->as_junction(params->size()-1, "body must be code"));

size_t pos_after=0;	size_t pos_after=0;
// parse columns	// parse columns
Line 52 static void _set(Request& r, const Strin	Line 53 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);
Array_iter i(rows);	Array_iter i(rows);
while(i.has_next()) {	while(i.has_next()) {
Array& row=*new(pool) Array(pool);	Array& row=*new(pool) Array(pool);
const String& string=*i.next_string();	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 80 static void _set(Request& r, const Strin	Line 81 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 94 static void _load(Request& r, const Stri	Line 95 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 128 static void _load(Request& r, const Stri	Line 136 static void _load(Request& r, const Stri
static_cast<VTable *>(r.self)->set_table(table);	static_cast<VTable *>(r.self)->set_table(table);
}	}

static Table *fill_month_days(Request& r,	/// @todo "x\nx" "xxx""xx"
const String& method_name, MethodParams *params, bool rus){
Pool& pool=r.pool();
Table result=new(pool) Table(pool, &method_name, 0/&columns*/);

int year=params->as_int(1, r);
int month=max(1, min(params->as_int(2, r), 12)) -1;

tm tmIn={0, 0, 0, 1, month, year-1900};
time_t t=mktime(&tmIn);
if(t<0)
PTHROW(0, 0,
&method_name,
"invalid date");
tm *tmOut=localtime(&t);

int weekDay1=tmOut->tm_wday;
if(rus)
weekDay1=weekDay1?weekDay1-1:6; //sunday last
int monthDays=getMonthDays(year, month);

for(int _day=1-weekDay1; _day<=monthDays;) {
Array& row=*new(pool) Array(pool, 7);
for(int wday=0; wday<7; wday++, _day++) {
String *cell=new(pool) String(pool);
if(_day>=1 && _day<=monthDays) {
char buf=(char )pool.malloc(2+1);
cell->APPEND_CLEAN(buf, sprintf(buf, "%02d", _day),
method_name.origin().file, method_name.origin().line);
}
row+=cell;
}
*result+=&row;
}

return result;
}

static Table *fill_week_days(Request& r,
const String& method_name, MethodParams *params, bool rus){
Pool& pool=r.pool();
Array& columns=*new(pool) Array(pool, 4);
columns+=new(pool) String(pool, "year");
columns+=new(pool) String(pool, "month");
columns+=new(pool) String(pool, "day");
columns+=new(pool) String(pool, "weekday");
Table *result=new(pool) Table(pool, &method_name, &columns);

int year=params->as_int(1, r);
int month=max(1, min(params->as_int(2, r), 12)) -1;
int day=params->as_int(3, r);

tm tmIn={0, 0, 18, day, month, year-1900};
time_t t=mktime(&tmIn);
if(t<0)
PTHROW(0, 0,
&method_name,
"invalid date");
tm *tmOut=localtime(&t);

int baseWeekDay=tmOut->tm_wday;
if(rus)
baseWeekDay=baseWeekDay?baseWeekDay-1:6; //sunday last

t-=baseWeekDay*SECS_PER_DAY;

for(int curWeekDay=0; curWeekDay<7; curWeekDay++, t+=SECS_PER_DAY) {
tm *tmOut=localtime(&t);
Array& row=*new(pool) Array(pool, 4);
#define WDFILL(size, value) { \
char buf=(char )pool.malloc(size+1); \
String *cell=new(pool) String(pool); \
cell->APPEND_CLEAN(buf, sprintf(buf, "%0"#size"d", value), \
method_name.origin().file, \
method_name.origin().line); \
row+=cell; \
}
WDFILL(4, 1900+tmOut->tm_year);
WDFILL(2, 1+tmOut->tm_mon);
WDFILL(2, tmOut->tm_mday);
WDFILL(2, tmOut->tm_wday);
*result+=&row;
}

return result;
}

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

const String& what=params->as_string(0, "format must be strig");
bool rus=false;
if(what=="rus")
rus=true;
else if(what=="eng")
rus=false;
else
PTHROW(0, 0,
&what,
"must be rus\|eng");

Table *result=0;
if(params->size()==1+2)
result=fill_month_days(r, method_name, params, rus);
else // 1+3
result=fill_week_days(r, method_name, params, rus);

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




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
Array_iter i(*table.columns());	Array_iter i(*table.columns());
Line 271 static void _save(Request& r, const Stri	Line 167 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("parser.runtime",
	&mode,
	"unknown mode, must be 'append'");

}	}
// data lines	// data lines
Array_iter i(table);	Array_iter i(table);
while(i.has_next()) {	while(i.has_next()) {
Array_iter c(static_cast<Array >(i.next()));	Array_iter c(static_cast<Array >(i.next()));
while(c.has_next()) {	while(c.has_next()) {
sdata.append(c.next_string(), //static_cast<String *>(row->quick_get(column)),	if(const String *s=c.next_string())
String::UL_TABLE);	sdata.append(*s,
	String::UL_TABLE);
if(c.has_next())	if(c.has_next())
sdata.APPEND_CONST("\t");	sdata.APPEND_CONST("\t");
}	}
Line 286 static void _save(Request& r, const Stri	Line 194 static void _save(Request& r, const Stri
}	}

// 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& method_name, 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());	int result=static_cast<VTable *>(r.self)->table().size();
value.set_name(method_name);	r.write_no_lang(*new(pool) VInt(pool, result));
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());	int result=1+static_cast<VTable *>(r.self)->table().current();
value.set_name(method_name);	r.write_no_lang(*new(pool) VInt(pool, result));
r.write_no_lang(value);
}	}

static void _offset(Request& r, const String& method_name, MethodParams *params) {	static void _offset(Request& r, const String& method_name, MethodParams *params) {
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) {
} else {	const String& whence=params->as_string(0, "whence must be string");
Value& value=*new(pool) VInt(pool, table.current());	if(whence=="cur")
value.set_name(method_name);	absolute=false;
r.write_no_lang(value);	else if(whence=="set")
}	absolute=true;
	else
	throw Exception("parser.runtime",
	&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_to_value(offset_expr).as_int());
	} else
	r.write_no_lang(*new(pool) VInt(pool, table.current()));
}	}

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);	Table& table=static_cast<VTable *>(r.self)->table();
Table& table=vtable.table();
bool need_delim=false;	bool need_delim=false;
int saved_current=table.current();	int saved_current=table.current();
int size=table.size();	int size=table.size();
for(int row=0; row<size; row++) {	for(int row=0; row<size; row++) {
table.set_current(row);	table.set_current(row);

Value& processed_body=r.process(body_code);	StringOrValue 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);
Line 342 static void _menu(Request& r, const Stri	Line 257 static void _menu(Request& r, const Stri
table.set_current(saved_current);	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: _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 363 static void table_row_to_hash(Array::Ite	Line 272 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())
Line 377 static void table_row_to_hash(Array::Ite	Line 286 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) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Table& table=static_cast<VTable *>(r.self)->table();	Table& self_table=static_cast<VTable *>(r.self)->table();
Value& result=*new(pool) VHash(pool);	Value& result=*new(pool) VHash(pool);
if(const Array *columns=table.columns())	if(const Array *columns=self_table.columns())
if(columns->size()>1) {	if(columns->size()>0) {

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("parser.runtime",
	&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
Row_info row_info={&table, key_field, &value_fields, result.get_hash()};	Row_info row_info={&self_table, key_field, &value_fields, result.get_hash(0)};
table.for_each(table_row_to_hash, &row_info);	self_table.for_each(table_row_to_hash, &row_info);
}	}
result.set_name(method_name);
r.write_no_lang(result);	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 418 struct Table_seq_item {	Line 330 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 438 static void _sort(Request& r, const Stri	Line 351 static void _sort(Request& r, const Stri
Pool& pool=r.pool();	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/..[desc\|asc\|]/?	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; // default=asc	false; // default=asc

Line 456 static void _sort(Request& r, const Stri	Line 369 static void _sort(Request& r, const Stri
old_table.set_current(i);	old_table.set_current(i);
// calculate key value	// calculate key value
seq[i].row=(MethodParams *)old_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_to_value(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 475 static void _sort(Request& r, const Stri	Line 388 static void _sort(Request& r, const Stri
for(i=0; i<old_table.size(); i++)	for(i=0; i<old_table.size(); i++)
new_table+=seq[reverse?old_table.size()-1-i:i].row;	new_table+=seq[reverse?old_table.size()-1-i:i].row;

r.write_no_lang(*new(pool) VTable(pool, &new_table));	// replace any previous table value
	static_cast<VTable *>(r.self)->set_table(new_table);
}	}

	static bool _locate_expression(Request& r, const String& method_name, MethodParams *params) {
	if(params->size()>1)
	throw Exception("parser.runtime",
	&method_name,
	"locate by expression has only one parameter - expression");

	Value& expression_code=params->as_junction(0, "must be expression");

	Table& table=static_cast<VTable *>(r.self)->table();
	int saved_current=table.current();
	int size=table.size();
	for(int row=0; row<size; row++) {
	table.set_current(row);

	if(r.process_to_value(expression_code).as_bool())
	return true;
	}
	table.set_current(saved_current);
	return false;
	}
	static bool _locate_name_value(Request& r, const String& method_name, MethodParams *params) {
	if(params->size()>2)
	throw Exception("parser.runtime",
	&method_name,
	"locate by name and value has only two parameters - name and value");

	Table& table=static_cast<VTable *>(r.self)->table();
	return table.locate(
	params->as_string(0, "column name must be string"),
	params->as_string(1, "value must be string")
	);
	}
static void _locate(Request& r, const String& method_name, MethodParams *params) {	static void _locate(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
	bool result=params->get(0).get_junction()?
VTable& vtable=static_cast<VTable >(r.self);	_locate_expression(r, method_name, params) :
Table& table=vtable.table();	_locate_name_value(r, method_name, params);
Value& result=*new(pool) VBool(pool, table.locate(	r.write_no_lang(*new(pool) VBool(pool, result));
params->get(0).as_string(),
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) {	static void _flip(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
VTable& vtable=static_cast<VTable >(r.self);	Table& old_table=static_cast<VTable *>(r.self)->table();

Table& old_table=*vtable.get_table();
Table& new_table=new(pool) Table(pool, &method_name, 0/nameless*/);	Table& new_table=new(pool) Table(pool, &method_name, 0/nameless*/);
if(old_table.size())	if(old_table.size())
if(int old_cols=old_table.at(0).size())	if(int old_cols=old_table.at(0).size())
Line 502 static void _flip(Request& r, const Stri	Line 442 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;
}	}
Line 512 static void _flip(Request& r, const Stri	Line 452 static void _flip(Request& r, const Stri

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_to_string(params->as_junction(0, "body must be code"));

// 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);	static_cast<VTable *>(r.self)->table()+=&row;
vtable.table()+=&row;
}	}

static void _join(Request& r, const String& method_name, MethodParams *params) {	static void _join(Request& r, const String& method_name, MethodParams *params) {
Line 529 static void _join(Request& r, const Stri	Line 469 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("parser.runtime",
&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("parser.runtime",
&method_name,	&method_name,
"source and destination are same table");	"source and destination are same table");

Line 545 static void _join(Request& r, const Stri	Line 485 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 566 public:	Line 508 public:
statement_string(astatement_string),	statement_string(astatement_string),
statement_cstr(astatement_cstr),	statement_cstr(astatement_cstr),
columns(*new(pool) Array(pool)),	columns(*new(pool) Array(pool)),
row(0), row_index(0),	row(0),
table(0)	table(0)
{	{
}	}
Line 589 public:	Line 531 public:
if(size)	if(size)
cell->APPEND_TAINTED(	cell->APPEND_TAINTED(
(const char *)ptr, size,	(const char *)ptr, size,
statement_cstr, row_index++);	statement_cstr, table->size()-1);
(*row)+=cell;	(*row)+=cell;
}	}

Line 599 private:	Line 541 private:
const String& statement_string; const char *statement_cstr;	const String& statement_string; const char *statement_cstr;
Array& columns;	Array& columns;
Array *row;	Array *row;
uint row_index;
public:	public:
Table *table;	Table *table;
};	};
Line 607 public:	Line 548 public:
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;
ulong offset=0;	ulong offset=0;
if(params->size()>1) {	if(params->size()>1) {
Value& options_param=params->as_no_junction(1, "options must be hash, not code");	Value& voptions=params->as_no_junction(1, "options must be hash, not code");
if(Hash *options=options_param.get_hash()) {	if(voptions.is_defined())
if(Value vlimit=(Value )options->get(*sql_limit_name))	if(Hash *options=voptions.get_hash(&method_name)) {
limit=(ulong)r.process(*vlimit).as_double();	if(Value vlimit=(Value )options->get(*sql_limit_name))
if(Value voffset=(Value )options->get(*sql_offset_name))	limit=(ulong)r.process_to_value(*vlimit).as_double();
offset=(ulong)r.process(*voffset).as_double();	if(Value voffset=(Value )options->get(*sql_offset_name))
} else	offset=(ulong)r.process_to_value(*voffset).as_double();
PTHROW(0, 0,	} else
&method_name,	throw Exception("parser.runtime",
"options must be hash");	&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_to_string(statement);
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));
Table_sql_event_handlers handlers(pool, method_name,	Table_sql_event_handlers handlers(pool, method_name,
statement_string, statement_cstr);	statement_string, statement_cstr);
bool need_rethrow=false; Exception rethrow_me;	try {
PTRY {	#ifdef RESOURCES_DEBUG
r.connection->query(	struct timeval mt[2];
	//measure:before
	gettimeofday(&mt[0],NULL);
	#endif
	r.connection(&method_name)->query(
statement_cstr, offset, limit,	statement_cstr, offset, limit,
handlers);	handlers);

	#ifdef RESOURCES_DEBUG
	//measure:after connect
	gettimeofday(&mt[1],NULL);

	double t[2];
	for(int i=0;i<2;i++)
	t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0;

	r.sql_request_time+=t[1]-t[0];
	#endif
	} catch(const Exception& e) { // query problem
	// more specific source [were url]
	throw Exception("sql.execute",
	&statement_string,
	"%s", e.comment());
}	}
PCATCH(e) { // query problem
rethrow_me=e; need_rethrow=true;
}
PEND_CATCH
if(need_rethrow)
PTHROW(rethrow_me.type(), rethrow_me.code(),
&statement_string, // setting more specific source [were url]
rethrow_me.comment());

Table *result=	Table *result=
handlers.table?handlers.table: // query resulted in table? return it	handlers.table?handlers.table: // query resulted in table? return it
Line 675 static void _columns(Request& r, const S	Line 624 static void _columns(Request& r, const S
}	}
}	}

VTable& result=*new(pool) VTable(pool, &result_table);	r.write_no_lang(*new(pool) VTable(pool, &result_table));
result.set_name(method_name);
r.write_no_lang(result);
}	}

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

MTable::MTable(Pool& apool) : Methoded(apool) {	Value& vcondition=params->as_junction(0, "condition must be expression");
set_name(*NEW String(pool(), TABLE_CLASS_NAME));

// ^table:set{data}	Table& source_table=static_cast<VTable *>(r.self)->table();
// ^table:set[nameless]{data}	Table& result_table=*new(pool) Table(pool,
add_native_method("set", Method::CT_DYNAMIC, _set, 1, 2);	source_table.origin_string(),
	source_table.columns()
	);

// ^table:load[file]	int saved_current=source_table.current();
// ^table:load[nameless;file]	int size=source_table.size();
add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);	for(int row=0; row<size; row++) {
	source_table.set_current(row);

// ^table:calendar[month\|montheng;year;month]	bool condition=r.process_to_value(vcondition,
// ^table:calendar[week\|weekeng;year;month;day]	/0/no name* /,*/
add_native_method("calendar", Method::CT_DYNAMIC, _calendar, 3, 4);	false/don't intercept string/).as_bool();

	if(condition) // ...condition is true=
	result_table+=&source_table.at(row); // =green light to go to result
	}
	source_table.set_current(saved_current);

	r.write_no_lang(*new(pool) VTable(pool, &result_table));
	}

	// constructor

	MTable::MTable(Pool& apool) : Methoded(apool, "table") {
	// ^table::create{data}
	// ^table::create[nameless]{data}
	// ^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[nameless;file]
	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);

// ^table.save[file]	// ^table.save[file]
// ^table.save[nameless;file]	// ^table.save[nameless;file]
Line 708 MTable::MTable(Pool& apool) : Methoded(a	Line 680 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: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}[desc\|asc]	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc\|asc]
// ^table.sort(numeric-key-maker) ^table.sort(numeric-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);	add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);

// ^table.locate[field;value]	// ^table.locate[field;value]
add_native_method("locate", Method::CT_DYNAMIC, _locate, 2, 2);	add_native_method("locate", Method::CT_DYNAMIC, _locate, 1, 2);

// ^table.flip[]	// ^table.flip[]
add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0);	add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0);
Line 745 MTable::MTable(Pool& apool) : Methoded(a	Line 715 MTable::MTable(Pool& apool) : Methoded(a

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

	// ^table.select(expression) = table
	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1);
}	}

// global variable	// global variable

E-mail:

Removed from v.1.107
changed lines
	Added in v.1.154