--- parser3/src/classes/int.C	2001/05/21 16:38:46	1.25
+++ parser3/src/classes/int.C	2001/08/07 13:54:13	1.32
@@ -5,8 +5,9 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: int.C,v 1.25 2001/05/21 16:38:46 parser Exp $
+	$Id: int.C,v 1.32 2001/08/07 13:54:13 parser Exp $
 */
+static const char *RCSId="$Id: int.C,v 1.32 2001/08/07 13:54:13 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_request.h"
@@ -24,9 +25,6 @@ void _string_format(Request& r, const St
 // class
 
 class MInt : public Methoded {
-public: // VStateless_class
-	Value *create_new_value(Pool& pool) { return new(pool) VInt(pool); }
-
 public:
 	MInt(Pool& pool);
 public: // Methoded
@@ -76,15 +74,38 @@ static void _mul(Request& r, const Strin
 static void _div(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__div); }
 static void _mod(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__mod); }
 
+// 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,
+								Hash *&options);
 
 static void _sql(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	VInt& result=*new(pool) VInt(sql_result_string(r, method_name, params).as_int());
+	int val;
+	Hash *options;
+	if(const String *string=sql_result_string(r, method_name, params, options))
+		val=string->as_int();
+	else
+		if(options) {
+			if(Value *vdefault=(Value *)options->get(*sql_default_name))
+				val=r.process(*vdefault).as_int();
+			else {
+				PTHROW(0, 0,
+					&method_name,
+					"produced no result, but no default option specified");
+				val=0; //calm, compiler
+			}
+		} else {
+			PTHROW(0, 0,
+				&method_name,
+				"produced no result, but no options (no default) specified");
+			val=0; //calm, compiler
+		}
+	VInt& result=*new(pool) VInt(pool, val);
 	result.set_name(method_name);
-	r.write_no_lang(result);
+	r.write_assign_lang(result);
 }
 
 // constructor
@@ -115,9 +136,10 @@ MInt::MInt(Pool& apool) : Methoded(apool
 
 	// ^int.format{format}
 	add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
-	// ^int:sql[query]
-	// ^int:sql[query](offset)
-	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
+
+	// ^sql[query]
+	// ^sql[query][$.limit(1) $.offset(2) $.default(0)]
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 }
 // global variable