--- parser3/src/classes/table.C 2010/05/16 22:12:50 1.271 +++ parser3/src/classes/table.C 2011/11/19 04:15:31 1.282 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2010/05/16 22:12:50 $"; +static const char * const IDENT_TABLE_C="$Date: 2011/11/19 04:15:31 $"; #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4)) #include @@ -21,18 +21,15 @@ static const char * const IDENT_TABLE_C= #include "pa_vint.h" #include "pa_sql_connection.h" #include "pa_vbool.h" +#include "pa_array.h" // class class MTable: public Methoded { public: // VStateless_class Value* create_new_value(Pool&) { return new VTable(); } - public: MTable(); - -public: // Methoded - bool used_directly() { return true; } }; // global variable @@ -106,9 +103,7 @@ static Table::Action_options get_action_ } if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); return result; } @@ -249,7 +244,7 @@ struct lsplit_result { inline lsplit_result lsplit(char* string, char delim1, char delim2) { lsplit_result result; - if(string) { + if(string) { char delims[]={delim1, delim2, 0}; if(char* v=strpbrk(string, delims)) { result.delim=*v; @@ -257,27 +252,27 @@ inline lsplit_result lsplit(char* string result.piece=v+1; return result; } - } + } result.piece=0; result.delim=0; - return result; + return result; } inline lsplit_result lsplit(char* *string_ref, char delim1, char delim2) { - lsplit_result result; + lsplit_result result; result.piece=*string_ref; lsplit_result next=lsplit(*string_ref, delim1, delim2); result.delim=next.delim; *string_ref=next.piece; - return result; + return result; } static lsplit_result lsplit(char** string_ref, char delim1, char delim2, char encloser) { lsplit_result result; - if(char* string=*string_ref) { + if(char* string=*string_ref) { if(encloser && *string==encloser) { - string++; + string++; char *read; char *write; @@ -303,9 +298,9 @@ static lsplit_result lsplit(char** strin return result; } else return lsplit(string_ref, delim1, delim2); - } + } result.piece=0; - return result; + return result; } static void skip_empty_and_comment_lines( char** data_ref ) { @@ -322,6 +317,22 @@ static void skip_empty_and_comment_lines } } +static void skip_empty_lines( char** data_ref ) { + if(char *data=*data_ref) { + while( char c=*data ) { + if( c== '\n' ) { + /*nowhere=*/getrow(&data); // remove empty lines + if(!(*data_ref=data)) + break; + continue; + } + break; + } + } +} + +typedef void (*Skip_lines_action)(char** data_ref); + static void _load(Request& r, MethodParams& params) { const String& first_param=params.as_string(0, FILE_NAME_MUST_BE_STRING); int filename_param_index=0; @@ -346,6 +357,8 @@ static void _load(Request& r, MethodPara options ); + Skip_lines_action skip_lines_action = (separators.column=='#' || separators.encloser=='#') ? skip_empty_lines : skip_empty_and_comment_lines; + // parse columns Table::columns_type columns; if(nameless) { @@ -353,7 +366,7 @@ static void _load(Request& r, MethodPara } else { columns=Table::columns_type(new ArrayString); - skip_empty_and_comment_lines(&data); + skip_lines_action(&data); while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) { *columns+=new String(sr.piece, String::L_TAINTED); if(sr.delim=='\n') @@ -366,7 +379,7 @@ static void _load(Request& r, MethodPara // parse cells Table::element_type row(new ArrayString(columns_count)); - skip_empty_and_comment_lines(&data); + skip_lines_action(&data); 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] break; @@ -374,7 +387,7 @@ static void _load(Request& r, MethodPara if(sr.delim=='\n') { table+=row; row=new ArrayString(columns_count); - skip_empty_and_comment_lines(&data); + skip_lines_action(&data); } } // last line [if without \n] @@ -458,22 +471,16 @@ static void _save(Request& r, MethodPara output_column_names=false; TableSeparators separators; - if(param_indexcount()) - 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_indexcount()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - } + if(param_indexcount() : 0; + else if(param == "cells") + result = table.count() ? table[table.current()]->count() : 0; + else if(param == "rows") // synonim for ^table.count[] + result = table.count(); + else + throw Exception(PARSER_RUNTIME, ¶m, "parameter must be 'columns', 'cells' and 'rows' only"); + } else + result = table.count(); + r.write_no_lang(*new VInt(result)); } @@ -789,16 +810,12 @@ static void _hash(Request& r, MethodPara } if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } } if(param_index==2) // options was specified but not as hash - throw Exception(PARSER_RUNTIME, - 0, - "options must be hash"); + throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH); Array value_fields; if(param_index==0){ // list of columns wasn't specified @@ -944,34 +961,37 @@ struct Expression_is_true_info { Value* expression_code; }; #endif + static bool expression_is_true(Table&, Expression_is_true_info* info) { return info->r->process_to_value(*info->expression_code).as_bool(); } -static bool _locate_expression(Table& table, Table::Action_options o, - Request& r, MethodParams& params) { - check_option_param(o.defined, params, 1, - "locate by expression only has parameters: expression and, maybe, options"); + +static bool _locate_expression(Table& table, Request& r, MethodParams& params) { Value& expression_code=params.as_junction(0, "must be expression"); + const size_t options_index=1; + Table::Action_options o=get_action_options(r, params, options_index, table); + check_option_param(o.defined, params, options_index, "locate by expression only has parameters: expression and, maybe, options"); Expression_is_true_info info={&r, &expression_code}; return table.table_first_that(expression_is_true, &info, o); } -static bool _locate_name_value(Table& table, Table::Action_options o, - Request&, MethodParams& params) { - check_option_param(o.defined, params, 2, - "locate by locate by name has parameters: name, value and, maybe, options"); + +static bool _locate_name_value(Table& table, Request& r, MethodParams& params) { const String& name=params.as_string(0, "column name must be string"); const String& value=params.as_string(1, VALUE_MUST_BE_STRING); + const size_t options_index=2; + Table::Action_options o=get_action_options(r, params, options_index, table); + check_option_param(o.defined, params, options_index, "locate by name has parameters: name, value and, maybe, options"); + return table.locate(name, value, o); } + static void _locate(Request& r, MethodParams& params) { Table& table=GET_SELF(r, VTable).table(); - Table::Action_options o=get_action_options(r, params, 1, table); - bool result=params[0].get_junction()? - _locate_expression(table, o, r, params) : - _locate_name_value(table, o, r, params); + _locate_expression(table, r, params) : + _locate_name_value(table, r, params); r.write_no_lang(VBool::get(result)); } @@ -1054,9 +1074,9 @@ public: columns(*new ArrayString), row(0), table(0) { } - bool add_column(SQL_Error& error, const char *str, size_t length) { + bool add_column(SQL_Error& error, const char *str, size_t ) { try { - columns+=new String(str, String::L_TAINTED, length); + columns+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::add_column"); @@ -1082,9 +1102,9 @@ public: return true; } } - 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 ) { try { - *row+=new String(str, String::L_TAINTED, length); + *row+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell"); @@ -1137,32 +1157,24 @@ static void _sql(Request& r, MethodParam HashStringValue* bind=0; ulong limit=SQL_NO_LIMIT; ulong offset=0; - if(params.count()>1) { - Value& voptions=params.as_no_junction(1, "options must be hash, not code"); - if(voptions.is_defined() && !voptions.is_string()) - if(HashStringValue* options=voptions.get_hash()) { - int valid_options=0; - if(Value* vbind=options->get(sql_bind_name)) { - valid_options++; - bind=vbind->get_hash(); - } - if(Value* vlimit=options->get(sql_limit_name)) { - valid_options++; - limit=(ulong)r.process_to_value(*vlimit).as_double(); - } - if(Value* voffset=options->get(sql_offset_name)) { - valid_options++; - offset=(ulong)r.process_to_value(*voffset).as_double(); - } - if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); - } else - throw Exception(PARSER_RUNTIME, - 0, - "options must be hash"); - } + if(params.count()>1) + if(HashStringValue* options=params.as_hash(1)) { + int valid_options=0; + if(Value* vbind=options->get(sql_bind_name)) { + valid_options++; + bind=vbind->get_hash(); + } + if(Value* vlimit=options->get(sql_limit_name)) { + valid_options++; + limit=(ulong)r.process_to_value(*vlimit).as_double(); + } + if(Value* voffset=options->get(sql_offset_name)) { + valid_options++; + offset=(ulong)r.process_to_value(*voffset).as_double(); + } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } SQL_Driver::Placeholder* placeholders=0; uint placeholders_count=0; @@ -1235,20 +1247,60 @@ static void _select(Request& r, MethodPa Value& vcondition=params.as_expression(0, "condition must be number, bool or expression"); Table& source_table=GET_SELF(r, VTable).table(); + + int limit=source_table.count(); + int offset=0; + bool reverse=false; + + if(params.count()>1) + if(HashStringValue* options=params.as_hash(1)) { + int valid_options=0; + if(Value* vlimit=options->get(sql_limit_name)) { + valid_options++; + limit=r.process_to_value(*vlimit).as_int(); + } + if(Value* voffset=options->get(sql_offset_name)) { + valid_options++; + offset=r.process_to_value(*voffset).as_int(); + } + if(Value* vreverse=options->get(table_reverse_name)) { + valid_options++; + reverse=r.process_to_value(*vreverse).as_bool(); + } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, + 0, + "called with invalid option"); + } + Table& result_table=*new Table(source_table.columns()); - int saved_current=source_table.current(); - int size=source_table.count(); - for(int row=0; row0){ + size_t saved_current=source_table.current(); + size_t appended=0; + + if(reverse){ + for(size_t row=size-1; result_table.count() < (size_t)limit; row--) { + source_table.set_current(row); + + bool condition=r.process_to_value(vcondition, false/*don't intercept string*/).as_bool(); + + if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result + result_table+=source_table[row]; + if(row==0) break; + } + } else { + for(size_t row=0; row < size && result_table.count() < (size_t)limit; row++) { + source_table.set_current(row); - bool condition=r.process_to_value(vcondition, - false/*don't intercept string*/).as_bool(); + bool condition=r.process_to_value(vcondition, false/*don't intercept string*/).as_bool(); - if(condition) // ...condition is true= - result_table+=source_table[row]; // =green light to go to result + if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result + result_table+=source_table[row]; + } + } + source_table.set_current(saved_current); } - source_table.set_current(saved_current); r.write_no_lang(*new VTable(&result_table)); } @@ -1274,7 +1326,10 @@ MTable::MTable(): Methoded("table") { // add_native_method("save_old", Method::CT_DYNAMIC, _save_old, 1, 3); // ^table.count[] - add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0); + // ^table.count[rows] + // ^table.count[columns] + // ^table.count[cells] + add_native_method("count", Method::CT_DYNAMIC, _count, 0, 1); // ^table.line[] add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0); @@ -1317,5 +1372,5 @@ MTable::MTable(): Methoded("table") { add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 1); // ^table.select(expression) = table - add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1); + add_native_method("select", Method::CT_DYNAMIC, _select, 1, 2); }