--- parser3/src/classes/table.C 2009/08/08 13:30:20 1.264 +++ parser3/src/classes/table.C 2011/05/15 13:20:07 1.280 @@ -5,11 +5,10 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2009/08/08 13:30:20 $"; +static const char * const IDENT_TABLE_C="$Date: 2011/05/15 13:20:07 $"; #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4)) #include -using namespace std; #endif #include "classes.h" @@ -17,22 +16,20 @@ using namespace std; #include "pa_common.h" #include "pa_request.h" +#include "pa_charsets.h" #include "pa_vtable.h" #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 @@ -54,12 +51,12 @@ String table_reverse_name(TABLE_REVERSE_ // methods static Table::Action_options get_action_options(Request& r, MethodParams& params, - const Table& source) { + size_t options_index, const Table& source) { Table::Action_options result; - if(!params.count()) + if(params.count() <= options_index) return result; - Value& maybe_options=params.last(); + Value& maybe_options=params[options_index]; /* can not do it: want to enable ^table::create[$source; # $.option[] @@ -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; } @@ -156,7 +151,7 @@ struct TableSeparators { static void _create(Request& r, MethodParams& params) { // clone/copy part? if(Table *source=params[0].get_table()) { - Table::Action_options o=get_action_options(r, params, *source); + Table::Action_options o=get_action_options(r, params, 1, *source); check_option_param(o.defined, params, 1, "too many parameters"); GET_SELF(r, VTable).set_table(*new Table(*source, o)); @@ -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] @@ -387,7 +400,12 @@ static void _load(Request& r, MethodPara #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4)) -void maybe_enclose( ostringstream& to, const String& from, char encloser ) { +#include "gc_allocator.h" + +typedef std::basic_stringstream, gc_allocator > pa_stringstream; +typedef std::basic_string, gc_allocator > pa_string; + +void maybe_enclose( pa_stringstream& to, const String& from, char encloser ) { if(encloser) { to<count()) - throw Exception(PARSER_RUNTIME, - 0, - "invalid option passed"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } else { throw Exception(PARSER_RUNTIME, 0, @@ -478,7 +494,7 @@ static void _save(Request& r, MethodPara #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4)) - ostringstream ost(stringstream::out); + pa_stringstream ost(std::stringstream::out); // process header if(output_column_names) { @@ -520,10 +536,10 @@ static void _save(Request& r, MethodPara // write { - string data=ost.str(); + pa_string data=ost.str(); const char* data_cstr=data.c_str(); - file_write(file_spec, data_cstr, data.length(), true /* as text */, do_append); + file_write(r.charsets, file_spec, data_cstr, data.length(), true /* as text */, do_append); } #else @@ -565,8 +581,7 @@ static void _save(Request& r, MethodPara // write { const char* data_cstr=sdata.cstr(); - file_write(file_spec, - data_cstr, sdata.length(), true, do_append); + 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) pa_free((void*)data_cstr); // not needed anymore } @@ -574,8 +589,22 @@ static void _save(Request& r, MethodPara #endif // don't use stringstream } -static void _count(Request& r, MethodParams&) { - int result=GET_SELF(r, VTable).table().count(); +static void _count(Request& r, MethodParams& params) { + Table& table=GET_SELF(r, VTable).table(); + size_t result=0; + if(params.count()) { + const String& param=params.as_string(0, PARAMETER_MUST_BE_STRING); + if(param == "columns") + result = table.columns() ? table.columns()->count() : 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)); } @@ -681,7 +710,8 @@ static void table_row_to_hash(Table::ele bool exist=false; switch(info->value_type) { case C_STRING: { - exist=info->hash->put_dont_replace(*key, new VString(*row->get(info->value_fields->get(0)))); + size_t index=info->value_fields->get(0); + exist=info->hash->put_dont_replace(*key, (index < row->count()) ? new VString(*row->get(index)) : new VString()); break; } case C_HASH: { @@ -784,16 +814,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 @@ -911,6 +937,14 @@ static void _sort(Request& r, MethodPara else 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; ir->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, 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)); } @@ -967,7 +1004,7 @@ static void _flip(Request& r, MethodPara Table& old_table=GET_SELF(r, VTable).table(); Table& new_table=*new Table(0); if(size_t old_count=old_table.count()) - if(size_t old_cols=old_table[0]->count()) + if(size_t old_cols=old_table.columns()?old_table.columns()->count():old_table[0]->count()) for(size_t column=0; columncount()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } else - throw Exception(PARSER_RUNTIME, - 0, - "options must be hash"); + throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH); } SQL_Driver::Placeholder* placeholders=0; @@ -1225,16 +1257,59 @@ static void _select(Request& r, MethodPa Table& source_table=GET_SELF(r, VTable).table(); Table& result_table=*new Table(source_table.columns()); + int limit=source_table.count(); + int offset = 0; + bool reverse = false; + + 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* 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"); + } else + throw Exception(PARSER_RUNTIME, + 0, + "options must be hash"); + } + int saved_current=source_table.current(); int size=source_table.count(); - for(int row=0; row=0 && result_table.count() < 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 > offset) // ...condition is true, adding to the result + result_table+=source_table[row]; + } + } else { + for(int row=0; row < size && result_table.count() < limit; row++) { + source_table.set_current(row); + + bool condition=r.process_to_value(vcondition, false/*don't intercept string*/).as_bool(); + + if(condition && ++appended > offset) // ...condition is true, adding to the result + result_table+=source_table[row]; + } } source_table.set_current(saved_current); @@ -1262,7 +1337,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); @@ -1305,5 +1383,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); }