--- parser3/src/classes/double.C	2001/05/21 16:55:52	1.29
+++ parser3/src/classes/double.C	2001/07/13 12:13:50	1.33
@@ -4,9 +4,8 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: double.C,v 1.29 2001/05/21 16:55:52 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"
@@ -27,7 +26,7 @@ class MDouble : public Methoded {
 public:
 	MDouble(Pool& pool);
 public: // Methoded
-	bool used_directly() { return false; }
+	bool used_directly() { return true; }
 };
 
 // methods
@@ -75,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);
@@ -92,6 +92,7 @@ static void _sql(Request& r, const Strin
 MDouble::MDouble(Pool& apool) : Methoded(apool) {
 	set_name(*NEW String(pool(), DOUBLE_CLASS_NAME));
 
+
 	// ^double.int[]
 	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
 
@@ -114,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