--- parser3/src/classes/double.C 2001/07/13 12:13:50 1.33 +++ parser3/src/classes/double.C 2001/07/27 12:59:36 1.35 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -static const char *RCSId="$Id: double.C,v 1.33 2001/07/13 12:13:50 parser Exp $"; +static const char *RCSId="$Id: double.C,v 1.35 2001/07/27 12:59:36 parser Exp $"; #include "classes.h" #include "pa_request.h" @@ -80,8 +80,18 @@ const String* sql_result_string(Request& static void _sql(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String *string=sql_result_string(r, method_name, params); - double val=string?string->as_int():params->as_double(1, r); + double val; + if(const String *string=sql_result_string(r, method_name, params)) + val=string->as_double(); + else + if(params->size()>1) + val=params->as_double(1, r); + else { + PTHROW(0, 0, + &method_name, + "produced no result, but no default specified"); + val=0; //calm, compiler + } VDouble& result=*new(pool) VDouble(pool, val); result.set_name(method_name); r.write_assign_lang(result); @@ -115,9 +125,9 @@ MDouble::MDouble(Pool& apool) : Methoded // ^double.format{format} add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1); + // ^double:sql[query] // ^double:sql[query](default) - // ^double:sql[query](default)(offset) - add_native_method("sql", Method::CT_STATIC, _sql, 2, 3); + add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); } // global variable