--- parser3/src/classes/table.C 2002/04/12 11:44:27 1.148 +++ parser3/src/classes/table.C 2002/09/17 08:44:45 1.161 @@ -3,10 +3,10 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: table.C,v 1.148 2002/04/12 11:44:27 paf Exp $ */ +static const char* IDENT_TABLE_C="$Date: 2002/09/17 08:44:45 $"; + #include "classes.h" #include "pa_common.h" #include "pa_request.h" @@ -15,10 +15,6 @@ #include "pa_sql_connection.h" #include "pa_vbool.h" -// defines - -#define TABLE_CLASS_NAME "table" - // class class MTable : public Methoded { @@ -34,14 +30,50 @@ public: // Methoded // methods +static void get_copy_options(Request& r, const String& method_name, MethodParams *params, int param_index, + const Table& source, + int& offset, + int& limit) { + offset=0; + limit=0; + if(params->size()<=param_index) + return; + + Value& voptions=params->as_no_junction(param_index, "options must be hash, not code"); + if(!voptions.is_string()) { + if(Hash *options=voptions.get_hash(&method_name)) { + if(Value *voffset=(Value *)options->get(*sql_offset_name)) + if(voffset->is_string()) { + const String& soffset=*voffset->get_string(); + if(soffset == "cur") + offset=source.current(); + else + throw Exception("parser.runtime", + &soffset, + "must be 'cur' string or expression"); + } else + offset=r.process_to_value(*voffset).as_int(); + if(Value *vlimit=(Value *)options->get(*sql_limit_name)) + limit=r.process_to_value(*vlimit).as_int(); + } else + throw Exception("parser.runtime", + &method_name, + "options must be hash"); + } + if(!limit) // zero limit = sould be 'nothing to copy', for methods zero means 'all' + limit=-1; // thus fixing +} + static void _create(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - // clone? - if(params->size()==1) - if(const Table *source=params->get(0).get_table()) { - static_cast(r.self)->set_table(*new(pool) Table(*source)); - return; - } + // clone/copy part? + if(const Table *source=params->get(0).get_table()) { + int offset, limit; + get_copy_options(r, method_name, params, 1, *source, + offset, limit); + static_cast(r.self)->set_table(*new(pool) Table(pool, *source, offset, limit)); + return; + } // data is last parameter Temp_lang temp_lang(r, String::UL_PASS_APPENDED); @@ -146,7 +178,7 @@ static void _save(Request& r, const Stri Value& vfile_name=params->as_no_junction(params->size()-1, "file name must not be code"); - Table& table=static_cast(r.self)->table(); + Table& table=static_cast(r.self)->table(&method_name); bool do_append=false; String sdata(pool); @@ -188,8 +220,9 @@ static void _save(Request& r, const Stri while(i.has_next()) { Array_iter c(*static_cast(i.next())); while(c.has_next()) { - sdata.append(*c.next_string(), //*static_cast(row->quick_get(column)), - String::UL_TABLE); + if(const String *s=c.next_string()) + sdata.append(*s, + String::UL_TABLE); if(c.has_next()) sdata.APPEND_CONST("\t"); } @@ -203,21 +236,19 @@ static void _save(Request& r, const Stri static void _count(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - Value& value=*new(pool) VInt(pool, static_cast(r.self)->table().size()); - value.set_name(method_name); - r.write_no_lang(value); + int result=static_cast(r.self)->table(&method_name).size(); + r.write_no_lang(*new(pool) VInt(pool, result)); } static void _line(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - Value& value=*new(pool) VInt(pool, 1+static_cast(r.self)->table().current()); - value.set_name(method_name); - r.write_no_lang(value); + int result=1+static_cast(r.self)->table(&method_name).current(); + r.write_no_lang(*new(pool) VInt(pool, result)); } static void _offset(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Table& table=static_cast(r.self)->table(); + Table& table=static_cast(r.self)->table(&method_name); if(params->size()) { bool absolute=false; if(params->size()>1) { @@ -230,15 +261,12 @@ static void _offset(Request& r, const St 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 { - Value& value=*new(pool) VInt(pool, table.current()); - value.set_name(method_name); - r.write_no_lang(value); - } + } else + r.write_no_lang(*new(pool) VInt(pool, table.current())); } static void _menu(Request& r, const String& method_name, MethodParams *params) { @@ -246,21 +274,21 @@ static void _menu(Request& r, const Stri Value *delim_maybe_code=params->size()>1?¶ms->get(1):0; - Table& table=static_cast(r.self)->table(); + Table& table=static_cast(r.self)->table(&method_name); bool need_delim=false; int saved_current=table.current(); int size=table.size(); for(int row=0; rowsize()) // need delim & iteration produced string? - r.write_pass_lang(r.process_to_string(*delim_maybe_code)); + StringOrValue sv_processed=r.process(body_code); + const String *s_processed=sv_processed.get_string(); + if(delim_maybe_code && s_processed && s_processed->size()) { // delimiter set and we have body + if(need_delim) // need delim & iteration produced string? + r.write_pass_lang(r.process(*delim_maybe_code)); need_delim=true; } - r.write_pass_lang(processed_body); + r.write_pass_lang(sv_processed); } table.set_current(saved_current); } @@ -294,10 +322,10 @@ static void table_row_to_hash(Array::Ite } static void _hash(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Table& self_table=static_cast(r.self)->table(); + Table& self_table=static_cast(r.self)->table(&method_name); Value& result=*new(pool) VHash(pool); - if(const Array *columns=self_table.columns()) - if(columns->size()>1) { + if(const Array *columns=self_table.columns()) + if(columns->size()>0) { const String& key_field_name=params->as_no_junction(0, "key field name must not be code").as_string(); int key_field=self_table.column_name2index(key_field_name, true); @@ -327,7 +355,6 @@ static void _hash(Request& r, const Stri Row_info row_info={&self_table, key_field, &value_fields, result.get_hash(0)}; self_table.for_each(table_row_to_hash, &row_info); } - result.set_name(method_name); r.write_no_lang(result); } @@ -364,7 +391,7 @@ static void _sort(Request& r, const Stri reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc": false; // default=asc - Table& old_table=static_cast(r.self)->table(); + Table& old_table=static_cast(r.self)->table(&method_name); 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()); @@ -409,7 +436,7 @@ static bool _locate_expression(Request& Value& expression_code=params->as_junction(0, "must be expression"); - Table& table=static_cast(r.self)->table(); + Table& table=static_cast(r.self)->table(&method_name); int saved_current=table.current(); int size=table.size(); for(int row=0; row(r.self)->table(); + Table& table=static_cast(r.self)->table(&method_name); return table.locate( params->as_string(0, "column name must be string"), params->as_string(1, "value must be string") @@ -435,17 +462,15 @@ static bool _locate_name_value(Request& } static void _locate(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& result=*new(pool) VBool(pool, - params->get(0).get_junction()? + bool result=params->get(0).get_junction()? _locate_expression(r, method_name, params) : - _locate_name_value(r, method_name, params)); - result.set_name(method_name); - r.write_no_lang(result); + _locate_name_value(r, method_name, params); + r.write_no_lang(*new(pool) VBool(pool, result)); } static void _flip(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Table& old_table=static_cast(r.self)->table(); + Table& old_table=static_cast(r.self)->table(&method_name); Table& new_table=*new(pool) Table(pool, &method_name, 0/*nameless*/); if(old_table.size()) if(int old_cols=old_table.at(0).size()) @@ -472,7 +497,7 @@ static void _append(Request& r, const St Array& row=*new(pool) Array(pool); string.split(row, 0, "\t", 1, String::UL_AS_IS); - static_cast(r.self)->table()+=&row; + static_cast(r.self)->table(&method_name)+=&row; } static void _join(Request& r, const String& method_name, MethodParams *params) { @@ -485,15 +510,23 @@ static void _join(Request& r, const Stri "source is not a table"); Table& src=*maybe_src; - Table& dest=static_cast(r.self)->table(); + Table& dest=static_cast(r.self)->table(&method_name); if(&src == &dest) throw Exception("parser.runtime", &method_name, "source and destination are same table"); + int offset, limit; + get_copy_options(r, method_name, params, 1, src, + offset, limit); + if(const Array *dest_columns=dest.columns()) { // dest is named int saved_src_current=src.current(); - for(int src_row=0; src_rowm) + limit=m; + int end=offset+limit; + for(int src_row=offset; src_rowsize(); dest_column++) { @@ -565,7 +598,7 @@ static void _sql(Request& r, const Strin ulong offset=0; if(params->size()>1) { Value& voptions=params->as_no_junction(1, "options must be hash, not code"); - if(voptions.is_defined()) + if(!voptions.is_string()) if(Hash *options=voptions.get_hash(&method_name)) { if(Value *vlimit=(Value *)options->get(*sql_limit_name)) limit=(ulong)r.process_to_value(*vlimit).as_double(); @@ -583,15 +616,15 @@ static void _sql(Request& r, const Strin statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); Table_sql_event_handlers handlers(pool, method_name, statement_string, statement_cstr); - try { #ifdef RESOURCES_DEBUG struct timeval mt[2]; //measure:before gettimeofday(&mt[0],NULL); #endif - r.connection(&method_name)->query( - statement_cstr, offset, limit, - handlers); + r.connection(&method_name)->query( + statement_cstr, offset, limit, + handlers, + statement_string); #ifdef RESOURCES_DEBUG //measure:after connect @@ -603,12 +636,6 @@ static void _sql(Request& r, const Strin 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()); - } Table *result= handlers.table?handlers.table: // query resulted in table? return it @@ -625,7 +652,7 @@ static void _columns(Request& r, const S result_columns+=new(pool) String(pool, "column"); Table& result_table=*new(pool) Table(pool, &method_name, &result_columns); - Table& source_table=static_cast(r.self)->table(); + Table& source_table=static_cast(r.self)->table(&method_name); if(const Array *source_columns=source_table.columns()) { Array_iter i(*source_columns); while(i.has_next()) { @@ -635,9 +662,7 @@ static void _columns(Request& r, const S } } - VTable& result=*new(pool) VTable(pool, &result_table); - result.set_name(method_name); - r.write_no_lang(result); + r.write_no_lang(*new(pool) VTable(pool, &result_table)); } static void _select(Request& r, const String& method_name, MethodParams *params) { @@ -645,7 +670,7 @@ static void _select(Request& r, const St Value& vcondition=params->as_junction(0, "condition must be expression"); - Table& source_table=static_cast(r.self)->table(); + Table& source_table=static_cast(r.self)->table(&method_name); Table& result_table=*new(pool) Table(pool, source_table.origin_string(), source_table.columns() @@ -656,10 +681,8 @@ static void _select(Request& r, const St for(int row=0; row