--- parser3/src/classes/string.C 2002/08/29 12:22:46 1.119 +++ parser3/src/classes/string.C 2002/12/09 12:19:16 1.124 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_STRING_C="$Date: 2002/08/29 12:22:46 $"; +static const char* IDENT_STRING_C="$Date: 2002/12/09 12:19:16 $"; #include "classes.h" #include "pa_request.h" @@ -31,17 +31,21 @@ public: // Methoded static void _length(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - double result=r.self->get_string()->size(); + double result=r.get_self()->get_string()->size(); r.write_no_lang(*new(pool) VDouble(pool, result)); } static void _int(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); + const String *self_string=r.get_self()->get_string(); int converted; - Value *default_code=params->size()>0? - default_code=¶ms->as_junction(0, "default must be int"):0; // (default) + Value *default_code=params->size()>0?¶ms->as_junction(0, "default must be int"):0; // (default) try { - converted=r.self->as_int(); + if(!self_string || self_string->is_empty()) + throw Exception("parser.runtime", + &method_name, + "parameter is empty string, error converting"); + converted=self_string->as_int(); } catch(...) { // convert problem if(!default_code) // we have a problem when no default /*re*/throw; @@ -53,11 +57,15 @@ static void _int(Request& r, const Strin static void _double(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); + const String *self_string=r.get_self()->get_string(); double converted; - Value *default_code=params->size()>0? - default_code=¶ms->as_junction(0, "default must be double"):0; // (default) + Value *default_code=params->size()>0?¶ms->as_junction(0, "default must be double"):0; // (default) try { - converted=r.self->as_double(); + if(!self_string || self_string->is_empty()) + throw Exception("parser.runtime", + &method_name, + "parameter is empty string, error converting"); + converted=self_string->as_double(); } catch(...) { // convert problem if(!default_code) // we have a problem when no default /*re*/throw; @@ -75,7 +83,7 @@ static void _double(Request& r, const St // for some time due to stupid {} in original design const String& fmt=r.process_to_string(fmt_maybe_code); - char *buf=format(pool, r.self->as_double(), fmt.cstr()); + char *buf=format(pool, r.get_self()->as_double(), fmt.cstr()); String result(pool); result.APPEND_CLEAN(buf, 0, @@ -89,7 +97,7 @@ static void _left(Request& r, const Stri size_t n=(size_t)params->as_int(0, "n must be int", r); - const String& string=static_cast(r.self)->string(); + const String& string=static_cast(r.get_self())->string(); r.write_assign_lang(string.mid(0, n)); } @@ -98,13 +106,13 @@ static void _right(Request& r, const Str size_t n=(size_t)params->as_int(0, "n must be int", r); - const String& string=static_cast(r.self)->string(); + const String& string=static_cast(r.get_self())->string(); r.write_assign_lang(string.mid(string.size()-n, string.size())); } static void _mid(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - const String& string=*r.self->get_string(); + const String& string=*r.get_self()->get_string(); size_t p=(size_t)max(0, params->as_int(0, "p must be int", r)); size_t n=params->size()>1? @@ -118,7 +126,7 @@ static void _pos(Request& r, const Strin Value& substr=params->as_no_junction(0, "substr must not be code"); - const String& string=static_cast(r.self)->string(); + const String& string=static_cast(r.get_self())->string(); r.write_assign_lang(*new(pool) VInt(pool, string.pos(substr.as_string()))); } @@ -215,7 +223,7 @@ static Table *split_horizontal(Request& static void split_with_options(Request& r, const String& method_name, MethodParams *params, int bits) { Pool& pool=r.pool(); - const String& string=*r.self->get_string(); + const String& string=*r.get_self()->get_string(); Array pieces(pool); split_list(r, method_name, params, 0, @@ -298,7 +306,7 @@ static void _match(Request& r, const Str Temp_lang temp_lang(r, String::UL_PASS_APPENDED); Table *table; if(params->size()<3) { // search - const String& src=static_cast(r.self)->string(); + const String& src=static_cast(r.get_self())->string(); bool was_global; bool matched=src.match( @@ -316,7 +324,7 @@ static void _match(Request& r, const Str result=new(pool) VBool(pool, matched); r.write_assign_lang(*result); } else { // replace - const String& src=*r.self->get_string(); + const String& src=*r.get_self()->get_string(); Value& replacement_code=params->as_junction(2, "replacement param must be code"); @@ -343,7 +351,7 @@ static void _match(Request& r, const Str static void change_case(Request& r, const String& method_name, MethodParams *params, String::Change_case_kind kind) { Pool& pool=r.pool(); - const String& src=static_cast(r.self)->string(); + const String& src=static_cast(r.get_self())->string(); r.write_assign_lang(src.change_case(pool, kind)); } @@ -358,7 +366,7 @@ static void _lower(Request& r, const Str class String_sql_event_handlers : public SQL_Driver_query_event_handlers { public: String_sql_event_handlers(Pool& apool, - const String& astatement_string, const char *astatement_cstr) : + const String& astatement_string, const char *astatement_cstr): pool(apool), statement_string(astatement_string), statement_cstr(astatement_cstr), @@ -366,23 +374,34 @@ public: result=new(pool) String(pool); } - void add_column(void *ptr, size_t size) { - if(got_column) - throw Exception("parser.runtime", + bool add_column(SQL_Error& error, void *ptr, size_t size) { + if(got_column) { + error=SQL_Error("parser.runtime", &statement_string, "result must contain exactly one column"); + return true; + } got_column=true; + return false; } - void before_rows() { /* ignore */ } - void add_row() { /* ignore */ } - void add_row_cell(void *ptr, size_t size) { - if(got_cell) - throw Exception("parser.runtime", + bool before_rows(SQL_Error& /*error*/ ) { /* ignore */ return false; } + bool add_row(SQL_Error& /*error*/) { /* ignore */ return false; } + bool add_row_cell(SQL_Error& error, void *ptr, size_t size) { + if(got_cell) { + error=SQL_Error("parser.runtime", &statement_string, "result must not contain more then one row"); - got_cell=true; + return true; + } - result->APPEND_TAINTED((const char *)ptr, size, statement_cstr, 0); + try { + got_cell=true; + result->APPEND_TAINTED((const char *)ptr, size, statement_cstr, 0); + return false; + } catch(...) { + error=SQL_Error("exception occured in String_sql_event_handlers::add_row_cell"); + return true; + } } private: @@ -464,7 +483,7 @@ static void _sql(Request& r, const Strin static void _replace(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String& src=*r.self->get_string(); + const String& src=*r.get_self()->get_string(); Table *table=params->as_no_junction(0, "parameter must not be code").get_table(); if(!table) @@ -480,7 +499,7 @@ static void _save(Request& r, const Stri const String& file_name=params->as_string(params->size()-1, "file name must be string"); - const String& src=static_cast(r.self)->string(); + const String& src=static_cast(r.get_self())->string(); bool do_append=false; if(params->size()>1) { @@ -494,13 +513,13 @@ static void _save(Request& r, const Stri } // write - const char *buf=src.cstr(String::UL_UNSPECIFIED); + const char *buf=src.cstr(String::UL_UNSPECIFIED, r.connection(0/*no error if none*/)); file_write(r.absolute(file_name), buf, strlen(buf), true, do_append); } static void _normalize(Request& r, const String& method_name, MethodParams * /*params*/) { - r.write_assign_lang(r.self->get_string()->join_chains(r.pool(), 0/*cstr*/)); + r.write_assign_lang(r.get_self()->get_string()->join_chains(r.pool(), 0/*cstr*/)); } // constructor