--- parser3/src/classes/table.C 2024/10/02 22:54:03 1.366 +++ parser3/src/classes/table.C 2024/10/27 17:50:59 1.369 @@ -24,8 +24,9 @@ #include "pa_sql_connection.h" #include "pa_vbool.h" #include "pa_array.h" +#include "pa_varray.h" -volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.366 2024/10/02 22:54:03 moko Exp $"; +volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.369 2024/10/27 17:50:59 moko Exp $"; // class @@ -750,7 +751,7 @@ static void _offset(Request& r, MethodPa else if(whence=="set") absolute=true; else - throw Exception(PARSER_RUNTIME, &whence, "is invalid whence, valid are 'cur' or 'set'"); + throw Exception(PARSER_RUNTIME, &whence, "is an invalid whence, valid are 'cur' or 'set'"); } int offset=params.as_int(params.count()-1, "offset must be expression", r); @@ -1010,6 +1011,28 @@ static void _hash(Request& r, MethodPara r.write(result); } +static void _cells(Request& r, MethodParams& params) { + Table& self_table=GET_SELF(r, VTable).table(); + 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); + if(limit<0) + limit=0; + if((size_t)limitcount(); i++) { + for(size_t i=0; icount(); i++) { const String *column = columns->get(i); if(Value* vto=names->get(*column)){ if(const String *sto=vto->get_string()) @@ -1537,7 +1560,7 @@ static void _rename(Request& r, MethodPa } } } else if(name_from){ - for(int i=0; icount(); i++) { + for(size_t i=0; icount(); i++) { const String *column = columns->get(i); if(*column == *name_from) columns->put(i, name_to); @@ -1595,6 +1618,10 @@ MTable::MTable(): Methoded("table") { // ^table.hash[key field name][value field name(s) string/table] add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3); + // ^table.cells[] + // ^table.cells(limit) + add_native_method("cells", Method::CT_DYNAMIC, _cells, 0, 1); + // ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc] // ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc|asc] add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);