--- parser3/src/classes/double.C 2001/06/28 07:41:59 1.31 +++ parser3/src/classes/double.C 2001/07/13 12:13:50 1.33 @@ -4,10 +4,8 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: double.C,v 1.31 2001/06/28 07:41:59 parser Exp $ */ -static char *RCSId="$Id: double.C,v 1.31 2001/06/28 07:41:59 parser Exp $"; +static const char *RCSId="$Id: double.C,v 1.33 2001/07/13 12:13:50 parser Exp $"; #include "classes.h" #include "pa_request.h" @@ -76,13 +74,14 @@ static void _mod(Request& r, const Strin // from string.C extern -String& sql_result_string(Request& r, const String& method_name, MethodParams *params); +const String* sql_result_string(Request& r, const String& method_name, + MethodParams *params); static void _sql(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - double val=sql_result_string(r, method_name, params).as_double(); - + const String *string=sql_result_string(r, method_name, params); + double val=string?string->as_int():params->as_double(1, r); VDouble& result=*new(pool) VDouble(pool, val); result.set_name(method_name); r.write_assign_lang(result); @@ -116,9 +115,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](offset) - add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); + // ^double:sql[query](default) + // ^double:sql[query](default)(offset) + add_native_method("sql", Method::CT_STATIC, _sql, 2, 3); } // global variable