--- parser3/src/classes/table.C 2023/09/26 20:49:06 1.361 +++ parser3/src/classes/table.C 2024/10/02 22:54:03 1.366 @@ -25,7 +25,7 @@ #include "pa_vbool.h" #include "pa_array.h" -volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.361 2023/09/26 20:49:06 moko Exp $"; +volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.366 2024/10/02 22:54:03 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++; } @@ -485,15 +488,15 @@ static void table_to_csv(pa_stringstream if(output_column_names) { if(table.columns()) { // named table if(control_chars.encloser){ - for(Array_iterator i(*table.columns()); i.has_next(); ) { + for(Array_iterator i(*table.columns()); i; ) { enclose( result, i.next(), control_chars.encloser ); - if(i.has_next()) + if(i) result< i(*table.columns()); i.has_next(); ) { + for(Array_iterator i(*table.columns()); i; ) { result<cstr(); - if(i.has_next()) + if(i) result< i(table); if(control_chars.encloser){ - while(i.has_next()) { - for(Array_iterator c(*i.next()); c.has_next(); ) { + while(i) { + for(Array_iterator c(*i.next()); c; ) { enclose( result, c.next(), control_chars.encloser ); - if(c.has_next()) + if(c) result< c(*i.next()); c.has_next(); ) { + while(i) { + for(Array_iterator c(*i.next()); c; ) { result<cstr(); - if(c.has_next()) + if(c) result< i(*table.columns()); i.has_next(); ) { + for(Array_iterator i(*table.columns()); i; ) { enclose( result, i.next(), control_chars.encloser, control_chars.sencloser ); - if(i.has_next()) + if(i) result<<*control_chars.sseparator; } } else { - for(Array_iterator i(*table.columns()); i.has_next(); ) { + for(Array_iterator i(*table.columns()); i; ) { result<<*i.next(); - if(i.has_next()) + if(i) result<<*control_chars.sseparator; } } @@ -580,9 +583,9 @@ static void table_to_csv(String& result, if(int lsize=table.count()?table[0]->count():0) for(int column=0; column i(table); if(control_chars.encloser){ - while(i.has_next()) { - for(Array_iterator c(*i.next()); c.has_next(); ) { + while(i) { + for(Array_iterator c(*i.next()); c; ) { enclose( result, c.next(), control_chars.encloser, control_chars.sencloser ); - if(c.has_next()) + if(c) result<<*control_chars.sseparator; } result.append_know_length("\n", 1, String::L_CLEAN); } } else { - while(i.has_next()) { - for(Array_iterator c(*i.next()); c.has_next(); ) { + while(i) { + for(Array_iterator c(*i.next()); c; ) { result<<*c.next(); - if(c.has_next()) + if(c) result<<*control_chars.sseparator; } result.append_know_length("\n", 1, String::L_CLEAN); @@ -843,14 +846,14 @@ static void table_row_to_hash(Table::ele HashStringValue& hash=vhash->hash(); Table::columns_type columns=info->table->columns(); if(info->value_fields){ // selected fields (can be empty) - for(Array_iterator i(*info->value_fields); i.has_next(); ) { + for(Array_iterator i(*info->value_fields); i; ) { size_t value_field=i.next(); if(value_fieldcount()) - hash.put(columns ? *columns->get(value_field) : String(format(value_field, 0)), new VString(*row->get(value_field))); + hash.put(columns ? *columns->get(value_field) : String(pa_uitoa(value_field)), new VString(*row->get(value_field))); } } else { // all fields for(size_t index=0; indexcount(); index++) { - hash.put(columns && index < columns->count() ? *columns->get(index) : String(format(index, 0)), new VString(*row->get(index))); + hash.put(columns && index < columns->count() ? *columns->get(index) : String(pa_uitoa(index)), new VString(*row->get(index))); } } exist=info->hash->put_dont_replace(*key, vhash); @@ -972,7 +975,7 @@ static void _hash(Request& r, MethodPara if(!field_name.is_empty()) value_fields+=self_table.column_name2index(field_name, true); } else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table - for(Array_iterator i(*value_fields_table); i.has_next(); ) { + for(Array_iterator i(*value_fields_table); i; ) { const String& value_field_name =*i.next()->get(0); value_fields +=self_table.column_name2index(value_field_name, true); } @@ -980,7 +983,7 @@ static void _hash(Request& r, MethodPara throw Exception(PARSER_RUNTIME, 0, "value field(s) must be string or table or code"); if(value_type==C_STRING && value_fields.count()>1) - 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)); @@ -1429,7 +1432,7 @@ static void _columns(Request& r, MethodP Table& source_table=GET_SELF(r, VTable).table(); if(Table::columns_type source_columns=source_table.columns()) { - for(Array_iterator i(*source_columns); i.has_next(); ) { + for(Array_iterator i(*source_columns); i; ) { Table::element_type result_row(new ArrayString); *result_row+=i.next(); result_table+=result_row;