--- parser3/src/classes/table.C	2009/09/17 23:32:39	1.268
+++ parser3/src/classes/table.C	2010/10/05 20:56:12	1.274
@@ -5,11 +5,10 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2009/09/17 23:32:39 $";
+static const char * const IDENT_TABLE_C="$Date: 2010/10/05 20:56:12 $";
 
 #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 #include <sstream>
-using namespace std;
 #endif
 
 #include "classes.h"
@@ -107,9 +106,7 @@ static Table::Action_options get_action_
 	} 
 
 	if(valid_options!=options->count())
-		throw Exception(PARSER_RUNTIME,
-			0,
-			"called with invalid option");
+		throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 
 	return result;
 }
@@ -250,7 +247,7 @@ struct lsplit_result {
 
 inline lsplit_result lsplit(char* string, char delim1, char delim2) {
 	lsplit_result result;
-    if(string) {
+	if(string) {
 		char delims[]={delim1, delim2, 0};
 		if(char* v=strpbrk(string, delims)) {
 			result.delim=*v;
@@ -258,27 +255,27 @@ inline lsplit_result lsplit(char* string
 			result.piece=v+1;
 			return result;
 		}
-    }
+	}
 	result.piece=0;
 	result.delim=0;
-    return result;
+	return result;
 }
 
 inline lsplit_result lsplit(char* *string_ref, char delim1, char delim2) {
-    lsplit_result result;
+	lsplit_result result;
 	result.piece=*string_ref;
 	lsplit_result next=lsplit(*string_ref, delim1, delim2);
 	result.delim=next.delim;
 	*string_ref=next.piece;
-    return result;
+	return result;
 }
 
 static lsplit_result lsplit(char** string_ref, char delim1, char delim2, char encloser) {
 	lsplit_result result;
 
-    if(char* string=*string_ref) {
+	if(char* string=*string_ref) {
 		if(encloser && *string==encloser) {
-            string++;
+			string++;
 			
 			char *read;
 			char *write;
@@ -304,9 +301,9 @@ static lsplit_result lsplit(char** strin
 			return result;
 		} else
 			return lsplit(string_ref, delim1, delim2);
-    }
+	}
 	result.piece=0;
-    return result;
+	return result;
 }
 
 static void skip_empty_and_comment_lines( char** data_ref ) {
@@ -323,6 +320,22 @@ static void skip_empty_and_comment_lines
 	}
 }
 
+static void skip_empty_lines( char** data_ref ) {
+	if(char *data=*data_ref) {
+		while( char c=*data ) {
+			if( c== '\n' ) {
+				/*nowhere=*/getrow(&data); // remove empty lines
+				if(!(*data_ref=data))
+					break;
+				continue;
+			}
+			break;
+		}
+	}
+}
+
+typedef void (*Skip_lines_action)(char** data_ref);
+
 static void _load(Request& r, MethodParams& params) {
 	const String&  first_param=params.as_string(0, FILE_NAME_MUST_BE_STRING);
 	int filename_param_index=0;
@@ -347,6 +360,8 @@ static void _load(Request& r, MethodPara
 		options
 	);
 
+	Skip_lines_action skip_lines_action = (separators.column=='#' || separators.encloser=='#') ? skip_empty_lines : skip_empty_and_comment_lines;
+
 	// parse columns
 	Table::columns_type columns;
 	if(nameless) {
@@ -354,7 +369,7 @@ static void _load(Request& r, MethodPara
 	} else {
 		columns=Table::columns_type(new ArrayString);
 
-		skip_empty_and_comment_lines(&data);
+		skip_lines_action(&data);
 		while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
 			*columns+=new String(sr.piece, String::L_TAINTED);
 			if(sr.delim=='\n') 
@@ -367,7 +382,7 @@ static void _load(Request& r, MethodPara
 
 	// parse cells
 	Table::element_type row(new ArrayString(columns_count));
-	skip_empty_and_comment_lines(&data);
+	skip_lines_action(&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]
 			break;
@@ -375,7 +390,7 @@ static void _load(Request& r, MethodPara
 		if(sr.delim=='\n') {
 			table+=row;
 			row=new ArrayString(columns_count);
-			skip_empty_and_comment_lines(&data);
+			skip_lines_action(&data);
 		}
 	}
 	// last line [if without \n]
@@ -388,7 +403,12 @@ static void _load(Request& r, MethodPara
 
 #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 
-void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
+#include "gc_allocator.h"
+
+typedef std::basic_stringstream<char, std::char_traits<char>, gc_allocator<char> > pa_stringstream;
+typedef std::basic_string<char, std::char_traits<char>, gc_allocator<char> > pa_string;
+
+void maybe_enclose( pa_stringstream& to, const String& from, char encloser ) {
 	if(encloser) {
 		to<<encloser;
 		// while we have 'encloser'...
@@ -460,9 +480,7 @@ static void _save(Request& r, MethodPara
 			if(HashStringValue* options=voptions.get_hash()) {
 				int valid_options=separators.load(*options);
 				if(valid_options!=options->count())
-					throw Exception(PARSER_RUNTIME,
-						0,
-						INVALID_OPTION_PASSED);
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			} else {
 				throw Exception(PARSER_RUNTIME,
 					0,
@@ -479,7 +497,7 @@ static void _save(Request& r, MethodPara
 
 #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 
-	ostringstream ost(stringstream::out);
+	pa_stringstream ost(std::stringstream::out);
 
 	// process header
 	if(output_column_names) {
@@ -521,7 +539,7 @@ static void _save(Request& r, MethodPara
 
 	// write
 	{
-		string data=ost.str();
+		pa_string data=ost.str();
 		const char* data_cstr=data.c_str();
 
 		file_write(r.charsets, file_spec, data_cstr, data.length(), true /* as text */, do_append);
@@ -681,7 +699,8 @@ static void table_row_to_hash(Table::ele
 	bool exist=false;
 	switch(info->value_type) {
 		case C_STRING: {
-			exist=info->hash->put_dont_replace(*key, new VString(*row->get(info->value_fields->get(0))));
+			size_t index=info->value_fields->get(0);
+			exist=info->hash->put_dont_replace(*key, (index < row->count()) ? new VString(*row->get(index)) : new VString());
 			break;
 		}
 		case C_HASH: {
@@ -784,16 +803,12 @@ static void _hash(Request& r, MethodPara
 					}
 
 					if(valid_options!=options->count())
-						throw Exception(PARSER_RUNTIME,
-							0,
-							"called with invalid option");
+						throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 				}
 			}
 
 			if(param_index==2) // options was specified but not as hash
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"options must be hash");
+				throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);
 
 			Array<int> value_fields;
 			if(param_index==0){ // list of columns wasn't specified
@@ -975,7 +990,7 @@ static void _flip(Request& r, MethodPara
 	Table& old_table=GET_SELF(r, VTable).table();
 	Table& new_table=*new Table(0);
 	if(size_t old_count=old_table.count())
-		if(size_t old_cols=old_table[0]->count()) 
+		if(size_t old_cols=old_table.columns()?old_table.columns()->count():old_table[0]->count()) 
 			for(size_t column=0; column<old_cols; column++) {
 				Table::element_type new_row(new ArrayString(old_count));
 				for(size_t i=0; i<old_count; i++) {
@@ -1051,7 +1066,7 @@ public:
 
 	bool add_column(SQL_Error& error, const char *str, size_t length) {
 		try {
-			columns+=new String(str, String::L_TAINTED, length);
+			columns+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
@@ -1079,7 +1094,7 @@ public:
 	}
 	bool add_row_cell(SQL_Error& error, const char* str, size_t length) {
 		try {
-			*row+=new String(str, String::L_TAINTED, length);
+			*row+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");
@@ -1150,13 +1165,9 @@ static void _sql(Request& r, MethodParam
 					offset=(ulong)r.process_to_value(*voffset).as_double();
 				}
 				if(valid_options!=options->count())
-					throw Exception(PARSER_RUNTIME,
-						0,
-						"called with invalid option");
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			} else
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"options must be hash");
+				throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);
 	}
 
 	SQL_Driver::Placeholder* placeholders=0;