--- parser3/src/classes/table.C 2002/10/23 09:32:17 1.166 +++ parser3/src/classes/table.C 2003/04/11 10:39:24 1.174 @@ -1,11 +1,11 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_TABLE_C="$Date: 2002/10/23 09:32:17 $"; +static const char* IDENT_TABLE_C="$Date: 2003/04/11 10:39:24 $"; #include "classes.h" #include "pa_common.h" @@ -125,12 +125,19 @@ static void _create(Request& r, const St static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - // filename is last parameter - Value& vfile_name=params->as_no_junction(params->size()-1, - "file name must not be code"); - + const String& first_param=params->as_string(0, "file name must be string"); + int filename_param_index=0; + bool nameless=first_param=="nameless"; + if(nameless) + filename_param_index++; + int options_param_index=filename_param_index+1; + // loading text - char *data=file_read_text(pool, r.absolute(vfile_name.as_string())); + char *data=file_read_text(pool, + r.absolute(params->as_string(filename_param_index, "file name must be string")), + true, + options_param_indexsize()?params->as_no_junction(options_param_index, "additional params must be hash").get_hash(&method_name):0 + ); // parse columns Array *columns; @@ -139,7 +146,7 @@ static void _load(Request& r, const Stri const char *file=origin.file; uint line=origin.line; #endif - if(params->size()==2) { + if(nameless) { columns=0; // nameless } else { columns=new(pool) Array(pool); @@ -303,6 +310,7 @@ static void _menu(Request& r, const Stri } #ifndef DOXYGEN +enum Table2hash_distint { D_ILLEGAL, D_FIRST, D_TABLES }; struct Row_info { Request *r; Table *table; @@ -310,8 +318,8 @@ struct Row_info { int key_field; Array *value_fields; Hash *hash; - bool distinct; - int index; + Table2hash_distint distinct; + int row; }; #endif static void table_row_to_hash(Array::Item *value, void *info) { @@ -321,7 +329,7 @@ static void table_row_to_hash(Array::Ite const String *key; if(ri.key_code) { - ri.table->set_current(ri.index++); // change context row + ri.table->set_current(ri.row++); // change context row StringOrValue sv_processed=ri.r->process(*ri.key_code); key=&sv_processed.as_string(); } else @@ -330,21 +338,46 @@ static void table_row_to_hash(Array::Ite if(!key) return; // ignore rows without key [too-short-record_array if-indexed] - VHash& result=*new(pool) VHash(pool); - Hash& hash=*result.get_hash(0); - for(int i=0; isize(); i++) { - int value_field=ri.value_fields->get_int(i); - if(value_fieldcolumns()->get_string(value_field), - new(pool) VString(*row.get_string(value_field))); + switch(ri.distinct) { + case D_ILLEGAL: case D_FIRST: + { + VHash& result=*new(pool) VHash(pool); + Hash& hash=*result.get_hash(0); + for(int i=0; isize(); i++) { + int value_field=ri.value_fields->get_int(i); + if(value_fieldcolumns()->get_string(value_field), + new(pool) VString(*row.get_string(value_field))); + } + + if(ri.hash->put_dont_replace(*key, &result)) // put. existed? + if(ri.distinct==D_ILLEGAL) + throw Exception("parser.runtime", + key, + "duplicate key"); + } + break; + case D_TABLES: + { + VTable* vtable=(VTable*)ri.hash->get(*key); // put. table existed? + Table* table; + if(vtable) + table=vtable->get_table(); + else { + // no? creating table of same structure as source + table=new(pool) Table(pool, *ri.table, 0, -1 /*no rows, just structure*/); + ri.hash->put(*key, new(pool) VTable(pool, table)); + } + *table+=&row; + } + break; + default: + throw Exception(0, + 0, + "invalid distinct code (#%d), ri.distinct"); } - if(ri.hash->put_dont_replace(*key, &result)) // put. existed? - if(!ri.distinct) - throw Exception("parser.runtime", - key, - "duplicate key"); } static void _hash(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); @@ -352,16 +385,26 @@ static void _hash(Request& r, const Stri Value& result=*new(pool) VHash(pool); if(const Array *columns=self_table.columns()) if(columns->size()>0) { - bool distinct=false; + Table2hash_distint distinct=D_ILLEGAL; int param_index=params->size()-1; if(param_index>0) { if(Hash *options= params->as_no_junction(param_index, "param must not be code").get_hash(0)) { --param_index; int valid_options=0; - if(Value *vdistinct=(Value *)options->get(*sql_distinct_name)) { + if(Value *vdistinct_code=(Value *)options->get(*sql_distinct_name)) { valid_options++; - distinct=r.process_to_value(*vdistinct).as_bool(); + Value& vdistinct_value=r.process_to_value(*vdistinct_code); + if(vdistinct_value.is_string()) { + const String& sdistinct=*vdistinct_value.get_string(); + if(sdistinct=="tables") + distinct=D_TABLES; + else + throw Exception("parser.runtime", + &sdistinct, + "must be 'tables' or true/false"); + } else + distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL; } if(valid_options!=options->size()) throw Exception("parser.runtime", @@ -376,6 +419,10 @@ static void _hash(Request& r, const Stri Array value_fields(pool); if(param_index>0) { + if(distinct!=D_ILLEGAL && distinct!=D_FIRST) + throw Exception("parser.runtime", + 0, + "in distinct[tables] mode you may not specify value field(s)"); Value& value_fields_param=params->as_no_junction(param_index, "value field(s) must not be code"); if(value_fields_param.is_string()) { value_fields+=self_table.column_name2index(value_fields_param.as_string(), true); @@ -391,8 +438,9 @@ static void _hash(Request& r, const Stri "value field(s) must be string or self_table" ); } else { // by all columns, including key - for(int i=0; isize(); i++) - value_fields+=i; + if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST)) + for(int i=0; isize(); i++) + value_fields+=i; } Value& key_param=params->get(0); @@ -400,7 +448,9 @@ static void _hash(Request& r, const Stri int key_field=key_code?-1 :self_table.column_name2index(key_param.as_string(), true); - Row_info row_info={&r, &self_table, key_code, key_field, &value_fields, result.get_hash(0), distinct}; + Row_info row_info={&r, &self_table, + key_code, key_field, &value_fields, + result.get_hash(0), distinct}; int saved_current=self_table.current(); self_table.for_each(table_row_to_hash, &row_info); @@ -443,6 +493,9 @@ static void _sort(Request& r, const Stri false; // default=asc Table& old_table=static_cast(r.get_self())->table(&method_name); + if(old_table.size()==0) + return; + Table& new_table=*new(pool) Table(pool, &method_name, old_table.columns()); Table_seq_item *seq=(Table_seq_item *)pool.malloc(sizeof(Table_seq_item)*old_table.size()); @@ -450,8 +503,6 @@ static void _sort(Request& r, const Stri // calculate key values bool key_values_are_strings=true; - // save 'current' - int saved_current=old_table.current(); for(i=0; iAPPEND_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( + bool add_column(SQL_Error& error, void *ptr, size_t size) { + try { + String *column=new(pool) String(pool); + column->APPEND_TAINTED( (const char *)ptr, size, - statement_cstr, table->size()-1); - (*row)+=cell; + statement_cstr, 0); + columns+=column; + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::add_column"); + return true; + } + } + bool before_rows(SQL_Error& error) { + try { + table=new(pool) Table(pool, &method_name, &columns); + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows"); + return true; + } + } + bool add_row(SQL_Error& error) { + try { + (*table)+=(row=new(pool) Array(pool)); + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::add_row"); + return true; + } + } + bool add_row_cell(SQL_Error& error, void *ptr, size_t size) { + try { + String *cell=new(pool) String(pool); + if(size) + cell->APPEND_TAINTED( + (const char *)ptr, size, + statement_cstr, table->size()-1); + (*row)+=cell; + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell"); + return true; + } } private: @@ -765,7 +838,7 @@ MTable::MTable(Pool& apool) : Methoded(a // ^table::load[file] // ^table::load[nameless;file] - add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); + add_native_method("load", Method::CT_DYNAMIC, _load, 1, 3); // ^table.save[file] // ^table.save[nameless;file]