--- parser3/src/classes/table.C 2001/10/31 14:08:36 1.129 +++ parser3/src/classes/table.C 2001/11/21 08:26:55 1.132 @@ -2,9 +2,9 @@ Parser: @b table parser class. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexander Petrosyan (http://paf.design.ru) - $Id: table.C,v 1.129 2001/10/31 14:08:36 paf Exp $ + $Id: table.C,v 1.132 2001/11/21 08:26:55 paf Exp $ */ #include "classes.h" @@ -38,10 +38,9 @@ public: // Methoded static void _set(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); // data is last parameter - Value& vdata=params->as_junction(params->size()-1, "body must be code"); - Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - const String& data=r.process(vdata).as_string(); + const String& data= + r.process(params->as_junction(params->size()-1, "body must be code")).as_string(); size_t pos_after=0; // parse columns @@ -413,7 +412,8 @@ static void _flip(Request& r, const Stri static void _append(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - // data is last parameter + // data + Temp_lang temp_lang(r, String::UL_PASS_APPENDED); const String& string= r.process(params->as_junction(0, "body must be code")).as_string(); @@ -467,7 +467,7 @@ public: statement_string(astatement_string), statement_cstr(astatement_cstr), columns(*new(pool) Array(pool)), - row(0), row_index(0), + row(0), table(0) { } @@ -490,7 +490,7 @@ public: if(size) cell->APPEND_TAINTED( (const char *)ptr, size, - statement_cstr, row_index++); + statement_cstr, table->size()-1); (*row)+=cell; } @@ -500,7 +500,6 @@ private: const String& statement_string; const char *statement_cstr; Array& columns; Array *row; - uint row_index; public: Table *table; };