--- parser3/src/classes/double.C 2001/05/21 17:11:57 1.30 +++ parser3/src/classes/double.C 2001/07/27 12:59:36 1.35 @@ -4,9 +4,8 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: double.C,v 1.30 2001/05/21 17:11:57 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" @@ -75,13 +74,24 @@ 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(); - + 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); @@ -116,7 +126,7 @@ MDouble::MDouble(Pool& apool) : Methoded add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1); // ^double:sql[query] - // ^double:sql[query](offset) + // ^double:sql[query](default) add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); } // global variable