--- parser3/src/classes/table.C	2010/07/05 05:54:46	1.272
+++ parser3/src/classes/table.C	2010/10/21 15:06:29	1.276
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2010/07/05 05:54:46 $";
+static const char * const IDENT_TABLE_C="$Date: 2010/10/21 15:06:29 $";
 
 #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 #include <sstream>
@@ -27,12 +27,8 @@ static const char * const IDENT_TABLE_C=
 class MTable: public Methoded {
 public: // VStateless_class
 	Value* create_new_value(Pool&) { return new VTable(); }
-
 public:
 	MTable();
-
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
@@ -247,7 +243,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;
@@ -255,27 +251,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;
@@ -301,9 +297,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 ) {
@@ -320,6 +316,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;
@@ -344,6 +356,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) {
@@ -351,7 +365,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') 
@@ -364,7 +378,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;
@@ -372,7 +386,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]
@@ -936,34 +950,37 @@ struct Expression_is_true_info {
 	Value* expression_code;
 };
 #endif
+
 static bool expression_is_true(Table&, Expression_is_true_info* info) {
 	return info->r->process_to_value(*info->expression_code).as_bool();
 }
-static bool _locate_expression(Table& table, Table::Action_options o,
-			       Request& r, MethodParams& params) {
-	check_option_param(o.defined, params, 1,
-		"locate by expression only has parameters: expression and, maybe, options");
+
+static bool _locate_expression(Table& table, Request& r, MethodParams& params) {
 	Value& expression_code=params.as_junction(0, "must be expression");
+	const size_t options_index=1;
+	Table::Action_options o=get_action_options(r, params, options_index, table);
+	check_option_param(o.defined, params, options_index, "locate by expression only has parameters: expression and, maybe, options");
 
 	Expression_is_true_info info={&r, &expression_code};
 	return table.table_first_that(expression_is_true, &info, o);
 }
-static bool _locate_name_value(Table& table, Table::Action_options o,
-			       Request&, MethodParams& params) {
-	check_option_param(o.defined, params, 2,
-		"locate by locate by name has parameters: name, value and, maybe, options");
+
+static bool _locate_name_value(Table& table, Request& r, MethodParams& params) {
 	const String& name=params.as_string(0, "column name must be string");
 	const String& value=params.as_string(1, VALUE_MUST_BE_STRING);
+	const size_t options_index=2;
+	Table::Action_options o=get_action_options(r, params, options_index, table);
+	check_option_param(o.defined, params, options_index, "locate by name has parameters: name, value and, maybe, options");
+
 	return table.locate(name, value, o);
 }
+
 static void _locate(Request& r, MethodParams& params) {
 	Table& table=GET_SELF(r, VTable).table();
 
-	Table::Action_options o=get_action_options(r, params, 1, table);
-
 	bool result=params[0].get_junction()?
-		_locate_expression(table, o, r, params) :
-		_locate_name_value(table, o, r, params);
+		_locate_expression(table, r, params) :
+		_locate_name_value(table, r, params);
 	r.write_no_lang(VBool::get(result));
 }
 
@@ -1048,7 +1065,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");
@@ -1076,7 +1093,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");