--- parser3/src/classes/string.C 2016/09/21 11:59:09 1.228 +++ parser3/src/classes/string.C 2016/10/04 13:23:46 1.230 @@ -20,7 +20,7 @@ #include "pa_vregex.h" #include "pa_charsets.h" -volatile const char * IDENT_STRING_C="$Id: string.C,v 1.228 2016/09/21 11:59:09 moko Exp $"; +volatile const char * IDENT_STRING_C="$Id: string.C,v 1.230 2016/10/04 13:23:46 moko Exp $"; // class @@ -535,11 +535,11 @@ const String* sql_result_string(Request& } if(Value* vlimit=options->get(sql_limit_name)) { valid_options++; - limit=(ulong)r.process_to_value(*vlimit).as_double(); + limit=(ulong)r.process(*vlimit).as_double(); } if(Value* voffset=options->get(sql_offset_name)) { valid_options++; - offset=(ulong)r.process_to_value(*voffset).as_double(); + offset=(ulong)r.process(*voffset).as_double(); } if((default_code=options->get(sql_default_name))) { valid_options++; @@ -620,7 +620,7 @@ static void _save(Request& r, MethodPara // ^file.save[filespec;$.charset[] $.append(true)] int valid_options=0; if(Value* vcharset_name=options->get(PA_CHARSET_NAME)){ - asked_charset=&::charsets.get(vcharset_name->as_string()); + asked_charset=&pa_charsets.get(vcharset_name->as_string()); valid_options++; } if(Value* vappend=options->get(MODE_APPEND)){ @@ -702,7 +702,7 @@ static void _base64(Request& r, MethodPa if(HashStringValue* options=params.as_hash(1)) { int valid_options=0; if(Value* vstrict=options->get(BASE64_STRICT_OPTION_NAME)) { - strict=r.process_to_value(*vstrict).as_bool(); + strict=r.process(*vstrict).as_bool(); valid_options++; } if(valid_options!=options->count()) @@ -763,7 +763,7 @@ static void _unescape(Request& r, Method if(HashStringValue* options=params.as_hash(2)) { int valid_options=0; if(Value* vcharset_name=options->get(PA_CHARSET_NAME)){ - from_charset=&::charsets.get(vcharset_name->as_string()); + from_charset=&pa_charsets.get(vcharset_name->as_string()); valid_options++; } if(valid_options!=options->count())