--- parser3/src/classes/table.C	2005/11/18 11:04:15	1.208.6.7
+++ parser3/src/classes/table.C	2006/01/20 11:28:44	1.220
@@ -4,8 +4,7 @@
 	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-
-static const char * const IDENT_TABLE_C="$Date: 2005/11/18 11:04:15 $";
+static const char * const IDENT_TABLE_C="$Date: 2006/01/20 11:28:44 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -21,7 +20,7 @@ static const char * const IDENT_TABLE_C=
 
 class MTable: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool&) { return new VTable(); }
+	Value* create_new_value(Pool&, HashStringValue&) { return new VTable(); }
 
 public:
 	MTable();
@@ -332,9 +331,10 @@ static void _load(Request& r, MethodPara
 	}
 	
 	Table& table=*new Table(columns);
+	int columns_count=columns? columns->count(): 0;
 
 	// parse cells
-	Table::element_type row(new ArrayString);
+	Table::element_type row(new ArrayString(columns_count));
 	skip_empty_and_comment_lines(&data);
 	while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
 		if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n]
@@ -342,7 +342,7 @@ static void _load(Request& r, MethodPara
 		*row+=new String(sr.piece, 0, true);
 		if(sr.delim=='\n') {
 			table+=row;
-			row=new ArrayString;
+			row=new ArrayString(columns_count);
 			skip_empty_and_comment_lines(&data);
 		}
 	}
@@ -359,9 +359,10 @@ static void maybe_enclose( String& to, c
 		to<<*sencloser;
 		// while we have 'encloser'...
 		size_t pos_after=0;
-		for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before+1) {
-            to<<from.mid(pos_before+1/*+found encloser*/, pos_after-pos_before);
-			to<<*sencloser;  to<<*sencloser; // doubling encloser
+		for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
+			pos_before++; // including first encloser (and skipping it for next pos)
+            to<<from.mid(pos_after, pos_before);
+			to<<*sencloser; // doubling encloser
 		}
 		// last piece
 		size_t from_length=from.length();
@@ -447,8 +448,13 @@ static void _save(Request& r, MethodPara
 	}
 
 	// write
-	file_write(r.absolute(file_name), 
-		sdata.cstr(), sdata.length(), true, do_append);
+	{
+		const char* data_cstr=sdata.cstr();
+		file_write(r.absolute(file_name), 
+			data_cstr, sdata.length(), true, do_append);
+		if(*data_cstr) // not empty (when empty it's not heap memory)
+			pa_free((void*)data_cstr); // not needed anymore
+	}
 }
 
 static void _count(Request& r, MethodParams&) {
@@ -841,6 +847,7 @@ static void _join(Request& r, MethodPara
 #ifndef DOXYGEN
 class Table_sql_event_handlers: public SQL_Driver_query_event_handlers {
 	ArrayString& columns;
+	int columns_count;
 	ArrayString* row;
 public:
 	Table* table;
@@ -861,6 +868,7 @@ public:
 	bool before_rows(SQL_Error& error) { 
 		try {
 			table=new Table(&columns);
+			columns_count=columns.count();
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows");
@@ -869,7 +877,7 @@ public:
 	}
 	bool add_row(SQL_Error& error) {
 		try {
-			*table+=row=new ArrayString;
+			*table+=row=new ArrayString(columns_count);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row");