--- parser3/src/classes/table.C 2002/02/07 11:55:30 1.142 +++ parser3/src/classes/table.C 2002/04/18 10:51:00 1.151 @@ -1,10 +1,10 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: table.C,v 1.142 2002/02/07 11:55:30 paf Exp $ + $Id: table.C,v 1.151 2002/04/18 10:51:00 paf Exp $ */ #include "classes.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 { @@ -46,7 +42,7 @@ static void _create(Request& r, const St // data is last parameter Temp_lang temp_lang(r, String::UL_PASS_APPENDED); const String& data= - r.process(params->as_junction(params->size()-1, "body must be code")).as_string(); + r.process_to_string(params->as_junction(params->size()-1, "body must be code")); size_t pos_after=0; // parse columns @@ -140,7 +136,7 @@ static void _load(Request& r, const Stri static_cast(r.self)->set_table(table); } -/// @todo "z\nz" "zzz""zz" +/// @todo "x\nx" "xxx""xx" static void _save(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); Value& vfile_name=params->as_no_junction(params->size()-1, @@ -178,7 +174,7 @@ static void _save(Request& r, const Stri else if(mode=="nameless") /*ok, already skipped names output*/; else - throw Exception(0, 0, + throw Exception("parser.runtime", &mode, "unknown mode, must be 'append'"); @@ -203,16 +199,14 @@ 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().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().current(); + r.write_no_lang(*new(pool) VInt(pool, result)); } static void _offset(Request& r, const String& method_name, MethodParams *params) { @@ -227,18 +221,15 @@ static void _offset(Request& r, const St else if(whence=="set") absolute=true; else - throw Exception(0, 0, + 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(offset_expr).as_int()); - } else { - Value& value=*new(pool) VInt(pool, table.current()); - value.set_name(method_name); - r.write_no_lang(value); - } + 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) { @@ -246,15 +237,14 @@ static void _menu(Request& r, const Stri Value *delim_maybe_code=params->size()>1?¶ms->get(1):0; - VTable& vtable=*static_cast(r.self); - Table& table=vtable.table(); + Table& table=static_cast(r.self)->table(); bool need_delim=false; int saved_current=table.current(); int size=table.size(); for(int row=0; rowsize()) // need delim & iteration produced string? @@ -315,7 +305,7 @@ static void _hash(Request& r, const Stri value_fields+=self_table.column_name2index(value_field_name, true); } } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "value field(s) must be string or self_table" ); @@ -328,7 +318,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); } @@ -379,7 +368,7 @@ static void _sort(Request& r, const Stri old_table.set_current(i); // calculate key value 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 key_values_are_strings=value.is_string(); @@ -402,24 +391,49 @@ static void _sort(Request& r, const Stri static_cast(r.self)->set_table(new_table); } -static void _locate(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +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"); - VTable& vtable=*static_cast(r.self); - Table& table=vtable.table(); - Value& result=*new(pool) VBool(pool, table.locate( + Table& table=static_cast(r.self)->table(); + int saved_current=table.current(); + int size=table.size(); + for(int row=0; rowsize()>2) + throw Exception("parser.runtime", + &method_name, + "locate by name and value has only two parameters - name and value"); + + Table& table=static_cast(r.self)->table(); + return table.locate( params->as_string(0, "column name must be string"), params->as_string(1, "value must be string") - )); - result.set_name(method_name); - r.write_no_lang(result); + ); +} +static void _locate(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + bool result=params->get(0).get_junction()? + _locate_expression(r, method_name, params) : + _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(); - VTable& vtable=*static_cast(r.self); - - Table& old_table=*vtable.get_table(); + Table& old_table=static_cast(r.self)->table(); Table& new_table=*new(pool) Table(pool, &method_name, 0/*nameless*/); if(old_table.size()) if(int old_cols=old_table.at(0).size()) @@ -440,14 +454,13 @@ static void _append(Request& r, const St // data Temp_lang temp_lang(r, String::UL_PASS_APPENDED); 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 Array& row=*new(pool) Array(pool); string.split(row, 0, "\t", 1, String::UL_AS_IS); - VTable& vtable=*static_cast(r.self); - vtable.table()+=&row; + static_cast(r.self)->table()+=&row; } static void _join(Request& r, const String& method_name, MethodParams *params) { @@ -455,14 +468,14 @@ static void _join(Request& r, const Stri Table *maybe_src=params->as_no_junction(0, "table ref must not be code").get_table(); if(!maybe_src) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "source is not a table"); Table& src=*maybe_src; Table& dest=static_cast(r.self)->table(); if(&src == &dest) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "source and destination are same table"); @@ -543,17 +556,17 @@ static void _sql(Request& r, const Strin if(voptions.is_defined()) if(Hash *options=voptions.get_hash(&method_name)) { if(Value *vlimit=(Value *)options->get(*sql_limit_name)) - limit=(ulong)r.process(*vlimit).as_double(); + limit=(ulong)r.process_to_value(*vlimit).as_double(); if(Value *voffset=(Value *)options->get(*sql_offset_name)) - offset=(ulong)r.process(*voffset).as_double(); + offset=(ulong)r.process_to_value(*voffset).as_double(); } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "options must be hash"); } 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= statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); Table_sql_event_handlers handlers(pool, method_name, @@ -580,7 +593,7 @@ static void _sql(Request& r, const Strin #endif } catch(const Exception& e) { // query problem // more specific source [were url] - throw Exception(e.type(), e.code(), + throw Exception("sql.execute", &statement_string, "%s", e.comment()); } @@ -610,16 +623,40 @@ 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)); } -// constructor +static void _select(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + Value& vcondition=params->as_junction(0, "condition must be expression"); -MTable::MTable(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), TABLE_CLASS_NAME)); + Table& source_table=static_cast(r.self)->table(); + Table& result_table=*new(pool) Table(pool, + source_table.origin_string(), + source_table.columns() + ); + int saved_current=source_table.current(); + int size=source_table.size(); + for(int row=0; row