--- parser3/src/classes/table.C 2024/09/07 16:30:26 1.362 +++ parser3/src/classes/table.C 2024/09/28 14:37:53 1.365 @@ -25,7 +25,7 @@ #include "pa_vbool.h" #include "pa_array.h" -volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.362 2024/09/07 16:30:26 moko Exp $"; +volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.365 2024/09/28 14:37:53 moko Exp $"; // class @@ -69,19 +69,22 @@ static Table::Action_options get_action_ result.offset=source.current(); else throw Exception(PARSER_RUNTIME, &soffset, "must be 'cur' string or expression"); - } else - result.offset=r.process(*voffset).as_int(); + } else { + int offset=r.process(*voffset).as_int(); + result.offset=offset < 0 ? 0 : offset; + } } if(Value* vlimit=options->get(sql_limit_name)) { valid_options++; - result.limit=r.process(*vlimit).as_int(); + int limit=r.process(*vlimit).as_int(); + result.limit=limit < 0 ? 0: limit; } - if(Value *vreverse=(Value *)options->get(table_reverse_name)) { + if(Value *vreverse=(Value *)options->get(table_reverse_name)) { valid_options++; result.reverse=r.process(*vreverse).as_bool(); if(result.reverse && !defined_offset) result.offset=source.count()-1; - } + } if(valid_options!=options->count()) throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); @@ -256,9 +259,9 @@ static void _create(Request& r, MethodPa if(params.count()>1) { if(params[0].is_string()){ // can be nameless only - const String& snameless=params.as_string(0, "called with more then 1 param, first param may be only string 'nameless' or junction"); + const String& snameless=params.as_string(0, "called with more than 1 param, first param may be only string 'nameless' or junction"); if(snameless!="nameless") - throw Exception(PARSER_RUNTIME, &snameless, "table::create called with more then 1 param, first param may be only 'nameless'"); + throw Exception(PARSER_RUNTIME, &snameless, "table::create called with more than 1 param, first param may be only 'nameless'"); nameless=true; data_param_index++; } @@ -580,9 +583,9 @@ static void table_to_csv(String& result, if(int lsize=table.count()?table[0]->count():0) for(int column=0; column1) - throw Exception(PARSER_RUNTIME, 0, "you can't specify more then one value field with option $.type[string]"); + throw Exception(PARSER_RUNTIME, 0, "you can't specify more than one value field with option $.type[string]"); } Value* key_param=¶ms[0]; @@ -1158,7 +1161,7 @@ static void _foreach(Request& r, MethodP table.set_current(row); if(rownum_var_name) - r.put_element(*var_context, *rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN))); + r.put_element(*var_context, *rownum_var_name, new VString(*new String(pa_uitoa(row), String::L_CLEAN))); if(value_var_name) r.put_element(*var_context, *value_var_name, new VTable(&table)); @@ -1183,7 +1186,7 @@ static void _foreach(Request& r, MethodP table.set_current(row); if(rownum_var_name) - r.put_element(*var_context, *rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN))); + r.put_element(*var_context, *rownum_var_name, new VString(*new String(pa_uitoa(row), String::L_CLEAN))); if(value_var_name) r.put_element(*var_context, *value_var_name, new VTable(&table));