--- parser3/src/classes/table.C 2013/07/23 14:29:02 1.294 +++ parser3/src/classes/table.C 2013/10/04 21:21:54 1.296 @@ -21,7 +21,7 @@ #include "pa_vbool.h" #include "pa_array.h" -volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.294 2013/07/23 14:29:02 moko Exp $"; +volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.296 2013/10/04 21:21:54 moko Exp $"; // class @@ -933,8 +933,7 @@ static void _sort(Request& r, MethodPara } // sort keys - _qsort(seq, old_count, sizeof(Table_seq_item), - key_values_are_strings?sort_cmp_string:sort_cmp_double); + qsort(seq, old_count, sizeof(Table_seq_item), key_values_are_strings?sort_cmp_string:sort_cmp_double); // reorder table as they require in 'seq' for(i=0; iput_element(*rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)), false); + var_context->put_element(*rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN))); if(value_var_name) - var_context->put_element(*value_var_name, new VTable(&table), false); + var_context->put_element(*value_var_name, new VTable(&table)); StringOrValue sv_processed=r.process(body_code); Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); @@ -1054,9 +1053,9 @@ static void _foreach(Request& r, MethodP table.set_current(row); if(rownum_var_name) - var_context->put_element(*rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)), false); + var_context->put_element(*rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN))); if(value_var_name) - var_context->put_element(*value_var_name, new VTable(&table), false); + var_context->put_element(*value_var_name, new VTable(&table)); r.process_write(body_code); Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);