--- parser3/src/classes/table.C 2024/12/06 23:20:04 1.376 +++ parser3/src/classes/table.C 2024/12/15 21:47:07 1.379 @@ -26,7 +26,7 @@ #include "pa_array.h" #include "pa_varray.h" -volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.376 2024/12/06 23:20:04 moko Exp $"; +volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.379 2024/12/15 21:47:07 moko Exp $"; // class @@ -624,7 +624,7 @@ static void table_to_csv(String& result, static void _save(Request& r, MethodParams& params) { - const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE); + const String& first_arg=params.as_string(0, PARAMETER_MUST_BE_STRING); size_t param_index=1; bool do_append=false; @@ -683,7 +683,7 @@ static void _csv_string(Request& r, Meth bool output_column_names=true; size_t param_index=0; if(params.count()>0 && params[0].is_string()) { - if(params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE)=="nameless") { + if(params.as_string(0, PARAM_MUST_NOT_BE_CODE)=="nameless") { output_column_names=false; param_index++; } else { @@ -1071,7 +1071,7 @@ static void _cells(Request& r, MethodPar size_t row_size=self_table[self_table.current()]->count(); // number of columns in current row if(params.count()){ - int limit=params.as_int(params.count()-1, "offset must be expression", r); + int limit=params.as_int(params.count()-1, "limit must be expression", r); if(limit<0) limit=0; if((size_t)limit (size_t)offset) // ...condition is true, adding to the result + if(condition && ++appended > (size_t)offset && source_table.valid(row)) // ...condition is true, adding to the result result_table+=source_table[row]; if(row==0) break; } @@ -1580,7 +1580,7 @@ static void _select(Request& r, MethodPa if(r.check_skip_break()) break; - if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result + if(condition && ++appended > (size_t)offset && source_table.valid(row)) // ...condition is true, adding to the result result_table+=source_table[row]; } }