--- parser3/src/classes/table.C 2005/11/25 10:47:26 1.208.6.9 +++ parser3/src/classes/table.C 2005/11/25 09:52:07 1.217 @@ -4,8 +4,7 @@ Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ - -static const char * const IDENT_TABLE_C="$Date: 2005/11/25 10:47:26 $"; +static const char * const IDENT_TABLE_C="$Date: 2005/11/25 09:52:07 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -21,7 +20,7 @@ static const char * const IDENT_TABLE_C= class MTable: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&) { return new VTable(); } + Value* create_new_value(Pool&, HashStringValue&) { return new VTable(); } public: MTable(); @@ -334,7 +333,7 @@ static void _load(Request& r, MethodPara Table& table=*new Table(columns); // parse cells - Table::element_type row(new ArrayString(columns_count)); + Table::element_type row(new ArrayString); skip_empty_and_comment_lines(&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] @@ -342,7 +341,7 @@ static void _load(Request& r, MethodPara *row+=new String(sr.piece, 0, true); if(sr.delim=='\n') { table+=row; - row=new ArrayString(columns_count); + row=new ArrayString; skip_empty_and_comment_lines(&data); } } @@ -846,7 +845,6 @@ static void _join(Request& r, MethodPara #ifndef DOXYGEN class Table_sql_event_handlers: public SQL_Driver_query_event_handlers { ArrayString& columns; - int columns_count; ArrayString* row; public: Table* table; @@ -867,7 +865,6 @@ public: bool before_rows(SQL_Error& error) { try { table=new Table(&columns); - columns_count=columns.count(); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows"); @@ -876,7 +873,7 @@ public: } bool add_row(SQL_Error& error) { try { - *table+=row=new ArrayString(columns_count); + *table+=row=new ArrayString; return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::add_row");