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.229 and 1.267

version 1.229, 2007/05/24 09:59:57	version 1.267, 2009/09/08 09:11:51
Line 1	Line 1
/** @file	/** @file
Parser: @b table parser class.	Parser: @b table parser class.

Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
*/	*/

static const char * const IDENT_TABLE_C="$Date$";	static const char * const IDENT_TABLE_C="$Date$";

	#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
#include <sstream>	#include <sstream>
using namespace std;	using namespace std;
	#endif

#include "classes.h"	#include "classes.h"
#include "pa_vmethod_frame.h"	#include "pa_vmethod_frame.h"

#include "pa_common.h"	#include "pa_common.h"
#include "pa_request.h"	#include "pa_request.h"
	#include "pa_charsets.h"
#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"
Line 24 using namespace std;	Line 27 using namespace std;

class MTable: public Methoded {	class MTable: public Methoded {
public: // VStateless_class	public: // VStateless_class
Value* create_new_value(Pool&, HashStringValue&) { return new VTable(); }	Value* create_new_value(Pool&) { return new VTable(); }

public:	public:
MTable();	MTable();
Line 37 public: // Methoded	Line 40 public: // Methoded

DECLARE_CLASS_VAR(table, new MTable, 0);	DECLARE_CLASS_VAR(table, new MTable, 0);

// externs

extern String cycle_data_name;

// defines for globals

#define SQL_BIND_NAME "bind"
#define SQL_DEFAULT_NAME "default"
#define SQL_DISTINCT_NAME "distinct"
#define SQL_VALUE_TYPE_NAME "type"
#define TABLE_REVERSE_NAME "reverse"	#define TABLE_REVERSE_NAME "reverse"


// globals	// globals

String sql_bind_name(SQL_BIND_NAME);	String sql_bind_name(SQL_BIND_NAME);
Line 130 static void check_option_param(bool opti	Line 122 static void check_option_param(bool opti
"%s", msg);	"%s", msg);
}	}

	struct TableSeparators {
	char column; const String* scolumn;
	char encloser; const String* sencloser;

	TableSeparators():
	column('\t'), scolumn(new String("\t")),
	encloser(0), sencloser(0)
	{}
	int load( HashStringValue& options ) {
	int result=0;
	if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
	scolumn=&vseparator->as_string();
	if(scolumn->length()!=1)
	throw Exception(PARSER_RUNTIME,
	scolumn,
	"separator must be one character long");
	column=scolumn->first_char();
	result++;
	}
	if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
	sencloser=&vencloser->as_string();
	if(sencloser->length()!=1)
	throw Exception(PARSER_RUNTIME,
	sencloser,
	"encloser must be one character long");
	encloser=sencloser->first_char();
	result++;
	}
	return result;
	}
	};

static void _create(Request& r, MethodParams& params) {	static void _create(Request& r, MethodParams& params) {
// clone/copy part?	// clone/copy part?
if(Table *source=params[0].get_table()) {	if(Table *source=params[0].get_table()) {
Line 140 static void _create(Request& r, MethodPa	Line 164 static void _create(Request& r, MethodPa
return;	return;
}	}

// data is last parameter	size_t data_param_index=0;
	bool nameless=false;

	if(params.count()>1) {
	if(params[0].is_string()){ // can be nameless only
	const String& snameless=params.as_string(0, "called with more then 1 param, first param may be only string 'nameless' or junction");
	if(snameless!="nameless")
	throw Exception(PARSER_RUNTIME,
	&snameless,
	"table::create called with more then 1 param, first param may be only 'nameless'");
	nameless=true;
	data_param_index++;
	}
	}

	HashStringValue *options=0;
	TableSeparators separators;

	size_t options_param_index=data_param_index+1;
	if(
	options_param_index<params.count()
	&& (options=params.as_no_junction(options_param_index, "additional params must be hash").get_hash())
	) {
	// cloning, so that we could change
	options=new HashStringValue(*options);
	separators.load(*options);
	if(separators.encloser){
	throw Exception(PARSER_RUNTIME,
	0,
	"encloser not supported for table::create yet");
	}
	}

	// data
Temp_lang temp_lang(r, String::L_PASS_APPENDED);	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
const String& data=	const String& data=
r.process_to_string(params.as_junction(params.count()-1, "body must be code"));	r.process_to_string(params.as_junction(data_param_index, "body must be code"));

// parse columns	// parse columns
size_t raw_pos_after=0;	size_t raw_pos_after=0;
Table::columns_type columns;	Table::columns_type columns;
if(params.count()==2) {
const String& snameless=params.as_string(0, "called with two params, first param may only be string 'nameless'");	if(nameless){
if(snameless!="nameless")
throw Exception(PARSER_RUNTIME,
&snameless,
"table::create called with two params, first param may only be 'nameless'");
columns=Table::columns_type(0); // nameless	columns=Table::columns_type(0); // nameless
} else {	} else {
columns=Table::columns_type(new ArrayString);	columns=Table::columns_type(new ArrayString);
Line 162 static void _create(Request& r, MethodPa	Line 215 static void _create(Request& r, MethodPa
data.split(head, raw_pos_after, "\n", String::L_AS_IS, 1);	data.split(head, raw_pos_after, "\n", String::L_AS_IS, 1);
if(head.count()) {	if(head.count()) {
size_t col_pos_after=0;	size_t col_pos_after=0;
head[0]->split(*columns, col_pos_after, "\t", String::L_AS_IS);	head[0]->split(columns, col_pos_after, separators.scolumn, String::L_AS_IS);
}	}
}	}

Line 174 static void _create(Request& r, MethodPa	Line 227 static void _create(Request& r, MethodPa
Array_iterator<const String*> i(rows);	Array_iterator<const String*> i(rows);
while(i.has_next()) {	while(i.has_next()) {
Table::element_type row(new ArrayString);	Table::element_type row(new ArrayString);
const String& string=*i.next();	const String& string=*i.next();
// remove comment lines	// remove comment lines
if(!string.length())	if(string.is_empty())
continue;	continue;

size_t col_pos_after=0;	size_t col_pos_after=0;
string.split(*row, col_pos_after, "\t", String::L_AS_IS);	string.split(row, col_pos_after, separators.scolumn, String::L_AS_IS);
table+=row;	table+=row;
}	}

Line 270 static void skip_empty_and_comment_lines	Line 323 static void skip_empty_and_comment_lines
}	}
}	}

struct TableSeparators {
char column; const String* scolumn;
char encloser; const String* sencloser;

TableSeparators():
column('\t'), scolumn(new String("\t", false)),
encloser(0), sencloser(0)
{}
int load( HashStringValue& options ) {
int result=0;
if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
scolumn=&vseparator->as_string();
if(scolumn->length()!=1)
throw Exception(PARSER_RUNTIME,
scolumn,
"separator must be one character long");
column=scolumn->first_char();
result++;
}
if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
sencloser=&vencloser->as_string();
if(sencloser->length()!=1)
throw Exception(PARSER_RUNTIME,
sencloser,
"encloser must be one character long");
encloser=sencloser->first_char();
result++;
}
return result;
}
};

static void _load(Request& r, MethodParams& params) {	static void _load(Request& r, MethodParams& params) {
const String& first_param=params.as_string(0, "file name must be string");	const String& first_param=params.as_string(0, FILE_NAME_MUST_BE_STRING);
int filename_param_index=0;	int filename_param_index=0;
bool nameless=first_param=="nameless";	bool nameless=first_param=="nameless";
if(nameless)	if(nameless)
Line 320 static void _load(Request& r, MethodPara	Line 341 static void _load(Request& r, MethodPara
}	}

// loading text	// loading text
char *data=file_read_text(r.charsets,	char *data=file_load_text(r,
r.absolute(params.as_string(filename_param_index, "file name must be string")),	r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)),
true,	true,
options	options
);	);
Line 335 static void _load(Request& r, MethodPara	Line 356 static void _load(Request& r, MethodPara

skip_empty_and_comment_lines(&data);	skip_empty_and_comment_lines(&data);
while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {	while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
*columns+=new String(sr.piece, 0, true);	*columns+=new String(sr.piece, String::L_TAINTED);
if(sr.delim=='\n')	if(sr.delim=='\n')
break;	break;
}	}
Line 350 static void _load(Request& r, MethodPara	Line 371 static void _load(Request& r, MethodPara
while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {	while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n]	if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n]
break;	break;
*row+=new String(sr.piece, 0, true);	*row+=new String(sr.piece, String::L_TAINTED);
if(sr.delim=='\n') {	if(sr.delim=='\n') {
table+=row;	table+=row;
row=new ArrayString(columns_count);	row=new ArrayString(columns_count);
Line 365 static void _load(Request& r, MethodPara	Line 386 static void _load(Request& r, MethodPara
GET_SELF(r, VTable).set_table(table);	GET_SELF(r, VTable).set_table(table);
}	}

void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {	#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))

	void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
if(encloser) {	if(encloser) {
to<<*sencloser;	to<<encloser;
// while we have 'encloser'...	// while we have 'encloser'...
size_t pos_after=0;	size_t pos_after=0;
for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {	for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
pos_before++; // including first encloser (and skipping it for next pos)	pos_before++; // including first encloser (and skipping it for next pos)
to<<from.mid(pos_after, pos_before);	to<<from.mid(pos_after, pos_before).cstr();
to<<*sencloser; // doubling encloser	to<<encloser; // doubling encloser
}	}
// last piece	// last piece
size_t from_length=from.length();	size_t from_length=from.length();
if(pos_after<from_length)	if(pos_after<from_length)
to<<from.mid(pos_after, from_length);	to<<from.mid(pos_after, from_length).cstr();

to<<*sencloser;	to<<encloser;
} else	} else
to<<from;	to<<from.cstr();
}	}

void maybe_enclose( ostringstream& to, const String& from, char encloser ) {	#else

	void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
if(encloser) {	if(encloser) {
to<<encloser;	to<<*sencloser;
// while we have 'encloser'...	// while we have 'encloser'...
size_t pos_after=0;	size_t pos_after=0;
for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {	for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
pos_before++; // including first encloser (and skipping it for next pos)	pos_before++; // including first encloser (and skipping it for next pos)
to<<from.mid(pos_after, pos_before).cstr();	to<<from.mid(pos_after, pos_before);
to<<encloser; // doubling encloser	to<<*sencloser; // doubling encloser
}	}
// last piece	// last piece
size_t from_length=from.length();	size_t from_length=from.length();
if(pos_after<from_length)	if(pos_after<from_length)
to<<from.mid(pos_after, from_length).cstr();	to<<from.mid(pos_after, from_length);

to<<encloser;	to<<*sencloser;
} else	} else
to<<from.cstr();	to<<from;
}	}

	#endif // don't use stringstream

static void _save_old(Request& r, MethodParams& params) {	static void _save(Request& r, MethodParams& params) {
const String& first_arg=params.as_string(0, "first argument must not be code");	const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
size_t param_index=1;	size_t param_index=1;

bool do_append=false;	bool do_append=false;
Line 421 static void _save_old(Request& r, Method	Line 447 static void _save_old(Request& r, Method
else	else
--param_index;	--param_index;

const String& file_name=params.as_string(param_index++, "file name must not be code");	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
	String file_spec=r.absolute(file_name);

	if(do_append && file_exist(file_spec))
	output_column_names=false;

TableSeparators separators;	TableSeparators separators;
if(param_index<params.count()) {	if(param_index<params.count()) {
Line 432 static void _save_old(Request& r, Method	Line 462 static void _save_old(Request& r, Method
if(valid_options!=options->count())	if(valid_options!=options->count())
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
"invalid option passed");	INVALID_OPTION_PASSED);
} else {	} else {
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
Line 447 static void _save_old(Request& r, Method	Line 477 static void _save_old(Request& r, Method

Table& table=GET_SELF(r, VTable).table();	Table& table=GET_SELF(r, VTable).table();

String sdata;	#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))

	ostringstream ost(stringstream::out);

	// process header
if(output_column_names) {	if(output_column_names) {
if(table.columns()) { // named table	if(table.columns()) { // named table
for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {	for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {
maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser );	maybe_enclose( ost, *i.next(), separators.encloser );
if(i.has_next())	if(i.has_next()){
sdata<<*separators.scolumn;	ost<<separators.column;
	}
}	}
} else { // nameless table [we were asked to output column names]	} else { // nameless table [we were asked to output column names]
if(int lsize=table.count()?table[0]->count():0)	if(int lsize=table.count()?table[0]->count():0)
for(int column=0; column<lsize; column++) {	for(int column=0; column<lsize; column++) {
char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];	if(separators.encloser) {
sdata.append_know_length(cindex_tab,	ost<<separators.encloser<<column<<separators.encloser;
snprintf(cindex_tab, MAX_NUMBER,	} else {
column<lsize-1?"%d%c":"%d", column, separators.column),	ost<<column;
String::L_CLEAN);	}
	if(column<lsize-1){
	ost<<separators.column;
	}
}	}
else	else
sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);	ost<<"empty nameless table";
}	}
sdata.append_know_length("\n", 1, String::L_CLEAN);	ost<<'\n';
}	}

// data lines	// process data lines
Array_iterator<ArrayString*> i(table);	Array_iterator<ArrayString*> i(table);
while(i.has_next()) {	while(i.has_next()) {
for(Array_iterator<const String> c(i.next()); c.has_next(); ) {	for(Array_iterator<const String> c(i.next()); c.has_next(); ) {
maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );	maybe_enclose( ost, *c.next(), separators.encloser );
if(c.has_next())	if(c.has_next())
sdata<<*separators.scolumn;	ost<<separators.column;
}	}
sdata.append_know_length("\n", 1, String::L_CLEAN);	ost<<'\n';
}	}

// write	// write
{	{
const char* data_cstr=sdata.cstr();	string data=ost.str();
file_write(r.absolute(file_name),	const char* data_cstr=data.c_str();
data_cstr, sdata.length(), true, do_append);
if(*data_cstr) // not empty (when empty it's not heap memory)
pa_free((void*)data_cstr); // not needed anymore
}
}

static void _save(Request& r, MethodParams& params) {
const String& first_arg=params.as_string(0, "first argument must not be code");
size_t param_index=1;

bool do_append=false;
bool output_column_names=true;

// mode?
if(first_arg=="append")
do_append=true;
else if(first_arg=="nameless")
output_column_names=false;
else
--param_index;

const String& file_name=params.as_string(param_index++, "file name must not be code");

TableSeparators separators;	file_write(r.charsets, file_spec, data_cstr, data.length(), true /* as text */, do_append);
if(param_index<params.count()) {
Value& voptions=params.as_no_junction(param_index++, "additional params must be hash");
if( voptions.is_defined() && !voptions.is_string() ) {
if(HashStringValue* options=voptions.get_hash()) {
int valid_options=separators.load(*options);
if(valid_options!=options->count())
throw Exception(PARSER_RUNTIME,
0,
"invalid option passed");
} else {
throw Exception(PARSER_RUNTIME,
0,
"additional params must be hash (did you spell mode parameter correctly?)");
}
}
}	}
if(param_index<params.count())
throw Exception(PARSER_RUNTIME,
0,
"bad mode (must be nameless or append)");

Table& table=GET_SELF(r, VTable).table();	#else

ostringstream ost(stringstream::out);

// process header	String sdata;
if(output_column_names) {	if(output_column_names) {
if(table.columns()) { // named table	if(table.columns()) { // named table
for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {	for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {
maybe_enclose( ost, *i.next(), separators.encloser );	maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser );
if(i.has_next()){	if(i.has_next())
ost<<separators.column;	sdata<<*separators.scolumn;
}
}	}
} else { // nameless table [we were asked to output column names]	} else { // nameless table [we were asked to output column names]
if(int lsize=table.count()?table[0]->count():0)	if(int lsize=table.count()?table[0]->count():0)
for(int column=0; column<lsize; column++) {	for(int column=0; column<lsize; column++) {
if(separators.encloser) {	char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];
ost<<separators.encloser<<column<<separators.encloser;	sdata.append_know_length(cindex_tab,
} else {	snprintf(cindex_tab, MAX_NUMBER,
ost<<column;	column<lsize-1?"%d%c":"%d", column, separators.column),
}	String::L_CLEAN);
if(column<lsize-1){
ost<<separators.column;
}
}	}
else	else
ost<<"empty nameless table";	sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
}	}
ost<<'\n';	sdata.append_know_length("\n", 1, String::L_CLEAN);
}	}

// process data lines	// data lines
Array_iterator<ArrayString*> i(table);	Array_iterator<ArrayString*> i(table);
while(i.has_next()) {	while(i.has_next()) {
for(Array_iterator<const String> c(i.next()); c.has_next(); ) {	for(Array_iterator<const String> c(i.next()); c.has_next(); ) {
maybe_enclose( ost, *c.next(), separators.encloser );	maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );
if(c.has_next())	if(c.has_next())
ost<<separators.column;	sdata<<*separators.scolumn;
}	}
ost<<'\n';	sdata.append_know_length("\n", 1, String::L_CLEAN);
}	}

// write	// write
{	{
string data=ost.str();	const char* data_cstr=sdata.cstr();
const char* data_cstr = data.c_str();	file_write(r.charsets, file_spec, data_cstr, sdata.length(), true, do_append);
	if(*data_cstr) // not empty (when empty it's not heap memory)
file_write(r.absolute(file_name), data_cstr, data.length(), true /* as text */, do_append);	pa_free((void*)data_cstr); // not needed anymore
}	}

	#endif // don't use stringstream
}	}

static void _count(Request& r, MethodParams&) {	static void _count(Request& r, MethodParams&) {
Line 614 static void _offset(Request& r, MethodPa	Line 607 static void _offset(Request& r, MethodPa
}	}

static void _menu(Request& r, MethodParams& params) {	static void _menu(Request& r, MethodParams& params) {
Temp_hash_value<const String::Body, void*>	InCycle temp(r);
cycle_data_setter(r.classes_conf, cycle_data_name, /any not null flag/&r);

Value& body_code=params.as_junction(0, "body must be code");	Value& body_code=params.as_junction(0, "body must be code");

Value* delim_maybe_code=params.count()>1?&params[1]:0;	Value* delim_maybe_code=params.count()>1?&params[1]:0;

Table& table=GET_SELF(r, VTable).table();	Table& table=GET_SELF(r, VTable).table();
bool need_delim=false;
int saved_current=table.current();	int saved_current=table.current();
int size=table.count();	int size=table.count();
for(int row=0; row<size; row++) {
table.set_current(row);

StringOrValue sv_processed=r.process(body_code);	if(delim_maybe_code) { // delimiter set
Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);	bool need_delim=false;
const String* s_processed=sv_processed.get_string();	for(int row=0; row<size; row++) {
if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body	table.set_current(row);
if(need_delim) // need delim & iteration produced string?
r.write_pass_lang(r.process(*delim_maybe_code));	StringOrValue sv_processed=r.process(body_code);
need_delim=true;	Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
}
r.write_pass_lang(sv_processed);	const String* s_processed=sv_processed.get_string();
	if(s_processed && !s_processed->is_empty()) { // we have body
	if(need_delim) // need delim & iteration produced string?
	r.write_pass_lang(r.process(*delim_maybe_code));
	else
	need_delim=true;
	}

if(lskip==Request::SKIP_BREAK)	r.write_pass_lang(sv_processed);
break;
	if(lskip==Request::SKIP_BREAK)
	break;
	}
	} else {
	for(int row=0; row<size; row++) {
	table.set_current(row);

	r.process_write(body_code);
	Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);

	if(lskip==Request::SKIP_BREAK)
	break;
	}
}	}
table.set_current(saved_current);	table.set_current(saved_current);
}	}

#ifndef DOXYGEN	#ifndef DOXYGEN
enum Table2hash_distint { D_ILLEGAL, D_FIRST };
enum Table2hash_value_type { C_HASH, C_STRING, C_TABLE };
struct Row_info {	struct Row_info {
Request *r;	Request *r;
Table *table;	Table *table;
Line 672 static void table_row_to_hash(Table::ele	Line 678 static void table_row_to_hash(Table::ele
if(!key)	if(!key)
return; // ignore rows without key [too-short-record_array if-indexed]	return; // ignore rows without key [too-short-record_array if-indexed]

bool exist = false;	bool exist=false;
switch (info->value_type) {	switch(info->value_type) {
case C_STRING:	case C_STRING: {
{
exist=info->hash->put_dont_replace(key, new VString(row->get(info->value_fields->get(0))));	exist=info->hash->put_dont_replace(key, new VString(row->get(info->value_fields->get(0))));
	break;
}	}
break;	case C_HASH: {
case C_HASH:
{
VHash* vhash=new VHash;	VHash* vhash=new VHash;
HashStringValue& hash=vhash->hash();	HashStringValue& hash=vhash->hash();
for(Array_iterator<int> i(*info->value_fields); i.has_next(); ) {	for(Array_iterator<int> i(*info->value_fields); i.has_next(); ) {
Line 692 static void table_row_to_hash(Table::ele	Line 696 static void table_row_to_hash(Table::ele
}	}

exist=info->hash->put_dont_replace(*key, vhash);	exist=info->hash->put_dont_replace(*key, vhash);
	break;
}	}
break;	case C_TABLE: {
case C_TABLE:	VTable* vtable=(VTable)info->hash->get(key); // table exist?
{
VTable* vtable=(VTable)info->hash->get(key); // put. table existed?
if( info->distinct==D_ILLEGAL ){
exist=true;
break;
}

Table* table;	Table* table;
if(vtable) {	if(vtable) {
	if(info->distinct==D_ILLEGAL) {
	exist=true;
	break;
	}
table=vtable->get_table();	table=vtable->get_table();
} else {	} else {
// no? creating table of same structure as source	// no? creating table of same structure as source
Line 712 static void table_row_to_hash(Table::ele	Line 714 static void table_row_to_hash(Table::ele
info->hash->put(*key, new VTable(table));	info->hash->put(*key, new VTable(table));
}	}
*table+=row;	*table+=row;
	break;
}	}
break;
}	}
if(exist && info->distinct==D_ILLEGAL)	if(exist && info->distinct==D_ILLEGAL)
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
key,	key,
"duplicate key");	"duplicate key");
}	}

	Table2hash_value_type get_value_type(Value& vvalue_type){
	if(vvalue_type.is_string()) {
	const String& svalue_type=*vvalue_type.get_string();
	if(svalue_type == "table"){
	return C_TABLE;
	} else if (svalue_type == "string") {
	return C_STRING;
	} else if (svalue_type == "hash") {
	return C_HASH;
	} else {
	throw Exception(PARSER_RUNTIME,
	&svalue_type,
	"must be 'hash', 'table' or 'string'");
	}
	} else {
	throw Exception(PARSER_RUNTIME,
	0,
	"'type' must be hash");
	}
	}

static void _hash(Request& r, MethodParams& params) {	static void _hash(Request& r, MethodParams& params) {
Table& self_table=GET_SELF(r, VTable).table();	Table& self_table=GET_SELF(r, VTable).table();
VHash& result=*new VHash;	VHash& result=*new VHash;
if(Table::columns_type columns=self_table.columns())	if(Table::columns_type columns=self_table.columns()){
if(columns->count()>0) {	if(columns->count()>0) {
Table2hash_distint distinct=D_ILLEGAL;	Table2hash_distint distinct=D_ILLEGAL;
Table2hash_value_type value_type=C_HASH;	Table2hash_value_type value_type=C_HASH;
int param_index=params.count()-1;	int param_index=params.count()-1;
if(param_index>0) {	if(param_index>0) {
if(HashStringValue* options=	if(HashStringValue* options=params.as_no_junction(param_index, PARAM_MUST_NOT_BE_CODE).get_hash()){ // options where specified
params.as_no_junction(param_index, "param must not be code").get_hash()
){
--param_index;	--param_index;
int valid_options=0;	int valid_options=0;
if(Value* vdistinct_code=options->get(sql_distinct_name)) {	if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?
valid_options++;	valid_options++;
Value& vdistinct_value=r.process_to_value(*vdistinct_code);	Value& vdistinct_value=r.process_to_value(*vdistinct_code);
if(vdistinct_value.is_string()) {	if(vdistinct_value.is_string()) {
Line 742 static void _hash(Request& r, MethodPara	Line 764 static void _hash(Request& r, MethodPara
if(sdistinct=="tables") {	if(sdistinct=="tables") {
value_type=C_TABLE;	value_type=C_TABLE;
distinct=D_FIRST;	distinct=D_FIRST;
} else	} else {
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
&sdistinct,	&sdistinct,
"must be 'tables' or true/false");	"must be 'tables' or true/false");
} else	}
	} else {
distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL;	distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL;
	}
}	}
if(Value* vvalue_type_code=options->get(sql_value_type_name)) {	if(Value* vvalue_type_code=options->get(sql_value_type_name)) { // $.type ?
if(value_type==C_TABLE){ // $.distinct[tables] was specified	if(value_type==C_TABLE) // $.distinct[tables] already was specified
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
"you can't specify $.distinct[tables] and $.values[] together.");	"you can't specify $.distinct[tables] and $.type[] together");
} else {
valid_options++;	valid_options++;
Value& vvalue_type_value=r.process_to_value(*vvalue_type_code);	value_type=get_value_type(r.process_to_value(*vvalue_type_code));
if(vvalue_type_value.is_string()) {	}
const String& svalue_type=*vvalue_type_value.get_string();
if(svalue_type == "table"){
value_type=C_TABLE;
} else if (svalue_type == "string") {
value_type=C_STRING;
} else if (svalue_type == "hash") {
value_type=C_HASH;
} else {
throw Exception(PARSER_RUNTIME,
&svalue_type,
"must be 'hash', 'table' or 'string'");
}
}
}
}

if(valid_options!=options->count())	if(valid_options!=options->count())
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
Line 780 static void _hash(Request& r, MethodPara	Line 789 static void _hash(Request& r, MethodPara
"called with invalid option");	"called with invalid option");
}	}
}	}
if(param_index==2) // bad options param type
	if(param_index==2) // options was specified but not as hash
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
"options must be hash");	"options must be hash");

Array<int> value_fields;	Array<int> value_fields;
if(param_index>0) {	if(param_index==0){ // list of columns wasn't specified
	if(value_type==C_STRING) // $.type[string]
	throw Exception(PARSER_RUNTIME,
	0,
	"you must specify one value field with option $.type[string]");

	for(size_t i=0; i<columns->count(); i++) // by all columns, including key
	value_fields+=i;

	} else { // list of columns was specified
if(value_type==C_TABLE)	if(value_type==C_TABLE)
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
"in distinct[tables] mode you may not specify value field(s)");	"you can't specify value field(s) with option $.distinct[tables] or $.type[tables]");

Value& value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code");	Value& value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code");
if(value_fields_param.is_string()) {	if(value_fields_param.is_string()) { // one column as string was specified
value_fields+=self_table.column_name2index(	value_fields+=self_table.column_name2index(*value_fields_param.get_string(), true);
*value_fields_param.get_string(), true);	} else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table
} else if(Table* value_fields_table=value_fields_param.get_table()) {	for(Array_iterator<Table::element_type> i(*value_fields_table); i.has_next(); ) {
for(Array_iterator<Table::element_type> i(*value_fields_table);	const String& value_field_name =*i.next()->get(0);
i.has_next(); ) {	value_fields +=self_table.column_name2index(value_field_name, true);
const String& value_field_name
=*i.next()->get(0);
value_fields
+=self_table.column_name2index(value_field_name, true);
}	}
} else	} else
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
"value field(s) must be string or table");	"value field(s) must be string or table");

} else { // by all columns, including key
if(value_type==C_STRING)
throw Exception(PARSER_RUNTIME,
0,
"with $.values[string] you must specify one value field(s)");
// if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
for(size_t i=0; i<columns->count(); i++)
value_fields+=i;
}	}

if(value_type==C_STRING && value_fields.count()!=1)	if(value_type==C_STRING && value_fields.count()!=1)
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
"you can specify one value field with this $.type[].");	"you can specify only one value field with option $.type[string]");

{	{
Value* key_param=&params[0];	Value* key_param=&params[0];
Line 846 static void _hash(Request& r, MethodPara	Line 853 static void _hash(Request& r, MethodPara
result.extract_default();	result.extract_default();
}	}
}	}
	}
r.write_no_lang(result);	r.write_no_lang(result);
}	}

Line 903 static void _sort(Request& r, MethodPara	Line 911 static void _sort(Request& r, MethodPara
else	else
seq[i].value.d=value.as_double();	seq[i].value.d=value.as_double();
}	}

	// @todo: handle this elsewhere
	if(r.charsets.source().NAME()=="KOI8-R" && key_values_are_strings) {
	for(i=0; i<old_count; i++)
	if(*seq[i].value.c_str)
	seq[i].value.c_str=Charset::transcode(seq[i].value.c_str, r.charsets.source(), UTF8_charset).cstr();
	}

// sort keys	// sort keys
_qsort(seq, old_count, sizeof(Table_seq_item),	_qsort(seq, old_count, sizeof(Table_seq_item),
key_values_are_strings?sort_cmp_string:sort_cmp_double);	key_values_are_strings?sort_cmp_string:sort_cmp_double);
Line 940 static bool _locate_name_value(Table& ta	Line 956 static bool _locate_name_value(Table& ta
check_option_param(o.defined, params, 2,	check_option_param(o.defined, params, 2,
"locate by locate by name has parameters: name, value and, maybe, options");	"locate by locate by name has parameters: name, value and, maybe, options");
const String& name=params.as_string(0, "column name must be string");	const String& name=params.as_string(0, "column name must be string");
const String& value=params.as_string(1, "value must be string");	const String& value=params.as_string(1, VALUE_MUST_BE_STRING);
return table.locate(name, value, o);	return table.locate(name, value, o);
}	}
static void _locate(Request& r, MethodParams& params) {	static void _locate(Request& r, MethodParams& params) {
Line 951 static void _locate(Request& r, MethodPa	Line 967 static void _locate(Request& r, MethodPa
bool result=params[0].get_junction()?	bool result=params[0].get_junction()?
_locate_expression(table, o, r, params) :	_locate_expression(table, o, r, params) :
_locate_name_value(table, o, r, params);	_locate_name_value(table, o, r, params);
r.write_no_lang(*new VBool(result));	r.write_no_lang(VBool::get(result));
}	}


Line 973 static void _flip(Request& r, MethodPara	Line 989 static void _flip(Request& r, MethodPara
}	}

static void _append(Request& r, MethodParams& params) {	static void _append(Request& r, MethodParams& params) {
// data
Temp_lang temp_lang(r, String::L_PASS_APPENDED);	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
const String& string=r.process_to_string(params.as_junction(0, "body must be code"));	const String& string=r.process_to_string(params[0]);

// parse cells	// parse cells
Table::element_type row=new ArrayString;	Table::element_type row=new ArrayString;
Line 1036 public:	Line 1051 public:

bool add_column(SQL_Error& error, const char *str, size_t length) {	bool add_column(SQL_Error& error, const char *str, size_t length) {
try {	try {
columns+=new String(str, length, true);	columns+=new String(str, String::L_TAINTED, length);
return false;	return false;
} catch(...) {	} catch(...) {
error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");	error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
Line 1064 public:	Line 1079 public:
}	}
bool add_row_cell(SQL_Error& error, const char* str, size_t length) {	bool add_row_cell(SQL_Error& error, const char* str, size_t length) {
try {	try {
String& cell=*new String;	*row+=new String(str, String::L_TAINTED, length);
if(length)
cell.append_know_length(str, length, String::L_TAINTED);
*row+=&cell;
return false;	return false;
} catch(...) {	} catch(...) {
error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");	error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");
Line 1084 static void marshal_bind(	Line 1096 static void marshal_bind(
{	{
SQL_Driver::Placeholder& ph=**pptr;	SQL_Driver::Placeholder& ph=**pptr;
ph.name=aname.cstr();	ph.name=aname.cstr();
ph.value=avalue->as_string().cstr(String::L_UNSPECIFIED);	ph.value=avalue->as_string().untaint_cstr(String::L_AS_IS);
ph.is_null=avalue->get_class()==void_class;	ph.is_null=avalue->get_class()==void_class;
ph.were_updated=false;	ph.were_updated=false;

Line 1107 void unmarshal_bind_updates(HashStringVa	Line 1119 void unmarshal_bind_updates(HashStringVa
if(ph->were_updated) {	if(ph->were_updated) {
Value* value;	Value* value;
if(ph->is_null)	if(ph->is_null)
value=new VVoid();	value=VVoid::get();
else	else
if(ph->value)	value=new VString(*new String(ph->value, String::L_TAINTED));
value=new VString(new String(ph->value, 0, true/tainted*/));
else
value=new VString(*new String());
hash.put(ph->name, value);	hash.put(ph->name, value);
}	}
}	}
Line 1121 static void _sql(Request& r, MethodParam	Line 1130 static void _sql(Request& r, MethodParam
Value& statement=params.as_junction(0, "statement must be code");	Value& statement=params.as_junction(0, "statement must be code");

HashStringValue* bind=0;	HashStringValue* bind=0;
ulong limit=0;	ulong limit=SQL_NO_LIMIT;
ulong offset=0;	ulong offset=0;
if(params.count()>1) {	if(params.count()>1) {
Value& voptions=params.as_no_junction(1, "options must be hash, not code");	Value& voptions=params.as_no_junction(1, "options must be hash, not code");
Line 1157 static void _sql(Request& r, MethodParam	Line 1166 static void _sql(Request& r, MethodParam

Temp_lang temp_lang(r, String::L_SQL);	Temp_lang temp_lang(r, String::L_SQL);
const String& statement_string=r.process_to_string(statement);	const String& statement_string=r.process_to_string(statement);
const char* statement_cstr=	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
statement_string.cstr(String::L_UNSPECIFIED, r.connection());
Table_sql_event_handlers handlers;	Table_sql_event_handlers handlers;
#ifdef RESOURCES_DEBUG	#ifdef RESOURCES_DEBUG
struct timeval mt[2];	struct timeval mt[2];
Line 1194 static void _sql(Request& r, MethodParam	Line 1203 static void _sql(Request& r, MethodParam
GET_SELF(r, VTable).set_table(result);	GET_SELF(r, VTable).set_table(result);
}	}

static void _columns(Request& r, MethodParams&) {	static void _columns(Request& r, MethodParams& params) {
	const String* column_column_name;
	if(params.count()>0)
	column_column_name=&params.as_string(0, COLUMN_NAME_MUST_BE_STRING);
	else
	column_column_name=new String("column");

Table::columns_type result_columns(new ArrayString);	Table::columns_type result_columns(new ArrayString);
*result_columns+=new String("column");	*result_columns+=column_column_name;
Table& result_table=*new Table(result_columns);	Table& result_table=*new Table(result_columns);

Table& source_table=GET_SELF(r, VTable).table();	Table& source_table=GET_SELF(r, VTable).table();
Line 1213 static void _columns(Request& r, MethodP	Line 1227 static void _columns(Request& r, MethodP
}	}

static void _select(Request& r, MethodParams& params) {	static void _select(Request& r, MethodParams& params) {
Value& vcondition=params.as_junction(0, "condition must be expression");	Value& vcondition=params.as_expression(0, "condition must be number, bool or expression");

Table& source_table=GET_SELF(r, VTable).table();	Table& source_table=GET_SELF(r, VTable).table();
Table& result_table=*new Table(source_table.columns());	Table& result_table=*new Table(source_table.columns());
Line 1240 MTable::MTable(): Methoded("table") {	Line 1254 MTable::MTable(): Methoded("table") {
// ^table::create{data}	// ^table::create{data}
// ^table::create[nameless]{data}	// ^table::create[nameless]{data}
// ^table::create[table]	// ^table::create[table]
add_native_method("create", Method::CT_DYNAMIC, _create, 1, 2);	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 3);
// old name for compatibility with <= v 1.141 2002/01/25 11:33:45 paf	// 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);	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 3);

// ^table::load[file]	// ^table::load[file]
// ^table::load[nameless;file]	// ^table::load[nameless;file]
Line 1269 MTable::MTable(): Methoded("table") {	Line 1283 MTable::MTable(): Methoded("table") {
// ^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:hash[key field name]	// ^table.hash[key field name]
// ^table:hash[key field name][value field name(s) string/table]	// ^table.hash[key field name][value field name(s) string/table]
add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3);	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3);

// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc\|asc]	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc\|asc]
Line 1290 MTable::MTable(): Methoded("table") {	Line 1304 MTable::MTable(): Methoded("table") {
add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);


// ^table:sql[query]	// ^table::sql[query]
// ^table:sql[query][$.limit(1) $.offset(2)]	// ^table::sql[query][$.limit(1) $.offset(2)]
add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);

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

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

E-mail:

Removed from v.1.229
changed lines
	Added in v.1.267