--- parser3/src/classes/hash.C 2008/05/29 09:26:34 1.86 +++ parser3/src/classes/hash.C 2009/04/16 01:10:21 1.89 @@ -1,11 +1,11 @@ /** @file Parser: @b hash parser class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_HASH_C="$Date: 2008/05/29 09:26:34 $"; +static const char * const IDENT_HASH_C="$Date: 2009/04/16 01:10:21 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -292,7 +292,7 @@ static void _intersects(Request& r, Meth result=GET_SELF(r, VHash).hash().first_that(intersects, b)!=0; // return result - r.write_no_lang(*new VBool(result)); + r.write_no_lang(VBool::get(result)); } @@ -310,7 +310,7 @@ static void _sql(Request& r, MethodParam Value& statement=params.as_junction(0, "statement must be code"); HashStringValue* bind=0; - ulong limit=0; + ulong limit=SQL_NO_LIMIT; ulong offset=0; bool distinct=false; Table2hash_value_type value_type=C_HASH; @@ -365,6 +365,7 @@ static void _sql(Request& r, MethodParam distinct, hash, value_type); + r.connection()->query( statement_cstr, placeholders_count, placeholders, @@ -410,9 +411,8 @@ static void _delete(Request& r, MethodPa } static void _contains(Request& r, MethodParams& params) { - - bool result = GET_SELF(r, VHash).hash().contains(params.as_string(0, "key must be string")); - r.write_no_lang(*new VBool(result)); + bool result=GET_SELF(r, VHash).hash().contains(params.as_string(0, "key must be string")); + r.write_no_lang(VBool::get(result)); } #ifndef DOXYGEN