--- parser3/src/classes/string.C 2007/04/23 10:30:10 1.153 +++ parser3/src/classes/string.C 2008/07/04 11:16:51 1.162 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_STRING_C="$Date: 2007/04/23 10:30:10 $"; +static const char * const IDENT_STRING_C="$Date: 2008/07/04 11:16:51 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -36,9 +36,9 @@ DECLARE_CLASS_VAR(string, new MString, 0 // defines for statics #define MATCH_VAR_NAME "match" -#define TRIM_START_OPTION "start" +#define TRIM_START_OPTION "left" +#define TRIM_END_OPTION "right" #define TRIM_BOTH_OPTION "both" -#define TRIM_END_OPTION "end" // statics @@ -96,7 +96,19 @@ static void _bool(Request& r, MethodPara throw Exception(PARSER_RUNTIME, 0, "parameter is empty string, error converting"); - converted=self_string.as_bool(); + + try { + converted=self_string.as_bool(); + } catch(...) { + const String& lower_string=self_string.change_case(r.charsets.source(), String::CC_LOWER); + if(lower_string == "true"){ + converted=true; + } else if (lower_string == "false"){ + converted=false; + } else { + rethrow; + } + } } catch(...) { // convert problem if(params.count()>0) converted=params.as_bool(0, "default must be bool", r); // (default) @@ -113,7 +125,7 @@ static void _bool(Request& r, MethodPara // for some time due to stupid {} in original design const String& fmt=r.process_to_string(fmt_maybe_code); - const char* buf=format(r.get_self().as_double(), fmt.cstrm()); + const char* buf=format(r.get_self().as_double(), fmt.trim().cstrm()); r.write_no_lang(String(buf)); } @@ -137,8 +149,7 @@ static void _right(Request& r, MethodPar 0, "n(%d) must be >=0", sn); size_t n=(size_t)sn; - - + const String& string=GET_SELF(r, VString).string(); size_t length=string.length(); r.write_assign_lang(n2){ + column_name=¶ms.as_string(2, COLUMN_NAME_MUST_BE_STRING); + if (horizontal && column_name->length()) + throw Exception(PARSER_RUNTIME, + column_name, + "column name can't be specified with horisontal split"); + } + if(!column_name || !column_name->length()) + column_name=new String("piece"); + + Table& table=horizontal?split_horizontal(pieces, right):split_vertical(pieces, right, column_name); r.write_no_lang(*new VTable(&table)); } @@ -344,7 +366,7 @@ static void _match(Request& r, MethodPar matches_count); // r.write_assign_lang(*new VTable(table)); if(table){ - r.write_assign_lang(*new VTable(table)); + r.write_assign_lang(*new VTable(table)); } else { r.write_assign_lang(*new VInt(matches_count)); } @@ -444,7 +466,7 @@ const String* sql_result_string(Request& Value& statement=params.as_junction(0, "statement must be code"); HashStringValue* bind=0; - ulong limit=0; + ulong limit=SQL_NO_LIMIT; ulong offset=0; default_code=0; if(params.count()>1) { @@ -488,6 +510,7 @@ const String* sql_result_string(Request& const char* statement_cstr= statement_string.cstr(String::L_UNSPECIFIED, r.connection()); String_sql_event_handlers handlers(statement_string, statement_cstr); + r.connection()->query( statement_cstr, placeholders_count, placeholders, @@ -524,7 +547,7 @@ static void _sql(Request& r, MethodParam static void _replace(Request& r, MethodParams& params) { const String& src=GET_SELF(r, VString).string(); - Table* table=params.as_no_junction(0, "parameter must not be code").get_table(); + Table* table=params.as_no_junction(0, PARAM_MUST_NOT_BE_CODE).get_table(); if(!table) throw Exception(PARSER_RUNTIME, 0, @@ -535,8 +558,7 @@ static void _replace(Request& r, MethodP } static void _save(Request& r, MethodParams& params) { - const String& file_name=params.as_string(params.count()-1, - "file name must be string"); + const String& file_name=params.as_string(params.count()-1, FILE_NAME_MUST_BE_STRING); const String& src=GET_SELF(r, VString).string(); @@ -572,12 +594,12 @@ static void _trim(Request& r, MethodPara const String& skind=params.as_string(0, "'where' must be string"); if(skind.length()) - if(skind==TRIM_START_OPTION) + if(skind==TRIM_BOTH_OPTION) + kind=String::TRIM_BOTH; + else if(skind==TRIM_START_OPTION || skind=="start") kind=String::TRIM_START; - else if(skind==TRIM_END_OPTION) + else if(skind==TRIM_END_OPTION || skind=="end") kind=String::TRIM_END; - else if(skind==TRIM_BOTH_OPTION) - kind=String::TRIM_BOTH; else throw Exception(PARSER_RUNTIME, &skind, @@ -597,7 +619,7 @@ static void _append(Request& r, MethodPa // c=a+b VString& va=GET_SELF(r, VString); const String& a=va.string(); - const String& b=params.as_string(0, "parameter must be string"); + const String& b=params.as_string(0, PARAMETER_MUST_BE_STRING); String& c=*new String(a); c.append(b, String::L_PASS_APPENDED); va.set_string(c); @@ -606,7 +628,7 @@ static void _append(Request& r, MethodPa static void _base64(Request& r, MethodParams& params) { if(params.count()) { // decode - const char* cstr=params.as_string(0, "parameter must be string").cstr(); + const char* cstr=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr(); char* decoded_cstr=0; size_t decoded_size=0; pa_base64_decode(cstr, strlen(cstr), decoded_cstr, decoded_size); @@ -652,7 +674,8 @@ MString::MString(): Methoded("string") { // ^string.split[delim] // ^string.split[delim][options] - add_native_method("split", Method::CT_DYNAMIC, _split, 1, 2); + // ^string.split[delim][options][column name] + add_native_method("split", Method::CT_DYNAMIC, _split, 1, 3); // old names for backward compatibility // ^string.lsplit[delim] add_native_method("lsplit", Method::CT_DYNAMIC, _lsplit, 1, 1);