--- parser3/src/classes/table.C 2009/09/17 23:32:39 1.268 +++ parser3/src/classes/table.C 2010/07/05 05:54:46 1.272 @@ -5,11 +5,10 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2009/09/17 23:32:39 $"; +static const char * const IDENT_TABLE_C="$Date: 2010/07/05 05:54:46 $"; #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4)) #include -using namespace std; #endif #include "classes.h" @@ -107,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; } @@ -388,7 +385,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, @@ -479,7 +479,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) { @@ -521,7 +521,7 @@ 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(r.charsets, file_spec, data_cstr, data.length(), true /* as text */, do_append); @@ -681,7 +681,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 +785,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 @@ -975,7 +972,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;