--- parser3/src/classes/table.C 2009/07/06 12:13:30 1.261 +++ parser3/src/classes/table.C 2010/07/21 22:29:05 1.273 @@ -5,11 +5,10 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2009/07/06 12:13:30 $"; +static const char * const IDENT_TABLE_C="$Date: 2010/07/21 22:29:05 $"; #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4)) #include -using namespace std; #endif #include "classes.h" @@ -17,6 +16,7 @@ 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" @@ -26,7 +26,7 @@ using namespace std; class MTable: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&, HashStringValue*) { return new VTable(); } + Value* create_new_value(Pool&) { return new VTable(); } public: MTable(); @@ -39,10 +39,6 @@ public: // Methoded DECLARE_CLASS_VAR(table, new MTable, 0); -// externs - -extern String cycle_data_name; - #define TABLE_REVERSE_NAME "reverse" // globals @@ -58,12 +54,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[] @@ -110,9 +106,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; } @@ -160,7 +154,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)); @@ -253,7 +247,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; @@ -261,27 +255,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; @@ -307,9 +301,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 ) { @@ -326,6 +320,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; @@ -350,6 +360,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) { @@ -357,7 +369,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') @@ -370,7 +382,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; @@ -378,7 +390,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] @@ -391,7 +403,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, @@ -482,7 +497,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) { @@ -524,10 +539,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 @@ -569,8 +584,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 } @@ -611,8 +625,7 @@ static void _offset(Request& r, MethodPa } static void _menu(Request& r, MethodParams& params) { - Temp_hash_value - cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); + InCycle temp(r); Value& body_code=params.as_junction(0, "body must be code"); @@ -686,7 +699,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: { @@ -789,16 +803,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 @@ -916,6 +926,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; icount()) + 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; @@ -1164,7 +1177,7 @@ static void _sql(Request& r, MethodParam Temp_lang temp_lang(r, String::L_SQL); const String& statement_string=r.process_to_string(statement); - const char* statement_cstr=statement_string.untaint_cstr(String::L_AS_IS, r.connection()); + const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection()); Table_sql_event_handlers handlers; #ifdef RESOURCES_DEBUG