--- parser3/src/classes/table.C	2001/12/15 21:28:18	1.136
+++ parser3/src/classes/table.C	2002/01/25 11:33:45	1.141
@@ -4,7 +4,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: table.C,v 1.136 2001/12/15 21:28:18 paf Exp $
+	$Id: table.C,v 1.141 2002/01/25 11:33:45 paf Exp $
 */
 
 #include "classes.h"
@@ -50,15 +50,15 @@ static void _set(Request& r, const Strin
 		columns=new(pool) Array(pool);
 
 		Array head(pool);
-		data.split(head, &pos_after, "\n", 1, String::UL_CLEAN, 1);
+		data.split(head, &pos_after, "\n", 1, String::UL_AS_IS, 1);
 		if(head.size())
-			head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_CLEAN);
+			head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_AS_IS);
 	}
 
 	Table& table=*new(pool) Table(pool, &method_name, columns);
 	// parse cells
 	Array rows(pool);
-	data.split(rows, &pos_after, "\n", 1, String::UL_CLEAN);
+	data.split(rows, &pos_after, "\n", 1, String::UL_AS_IS);
 	Array_iter i(rows);
 	while(i.has_next()) {
 		Array& row=*new(pool) Array(pool);
@@ -67,7 +67,7 @@ static void _set(Request& r, const Strin
 		if(!string.size())
 			continue;
 
-		string.split(row, 0, "\t", 1, String::UL_CLEAN);
+		string.split(row, 0, "\t", 1, String::UL_AS_IS);
 		table+=&row;
 	}
 
@@ -92,16 +92,22 @@ static void _load(Request& r, const Stri
 	uint line=origin.line;
 #endif
 	if(params->size()==2) {
-		columns=0;
+		columns=0; // nameless
 	} else {
 		columns=new(pool) Array(pool);
 
-		if(char *row_chars=getrow(&data)) 
+		while(char *row_chars=getrow(&data)) {
+			// remove empty&comment lines
+			if(!*row_chars || *row_chars == '#')
+				continue;
 			do {
 				String *name=new(pool) String(pool);
 				name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++);
 				*columns+=name;
 			} while(row_chars);
+
+			break;
+		}
 	}
 
 	// parse cells
@@ -184,7 +190,7 @@ static void _save(Request& r, const Stri
 	}
 
 	// write
-	file_write(pool, r.absolute(vfile_name.as_string()), 
+	file_write(r.absolute(vfile_name.as_string()), 
 		sdata.cstr(), sdata.size(), true, do_append);
 }
 
@@ -431,7 +437,7 @@ static void _append(Request& r, const St
 
 	// parse cells
 	Array& row=*new(pool) Array(pool);
-	string.split(row, 0, "\t", 1, String::UL_CLEAN);
+	string.split(row, 0, "\t", 1, String::UL_AS_IS);
 
 	VTable& vtable=*static_cast<VTable *>(r.self);
 	vtable.table()+=&row;
@@ -458,8 +464,10 @@ static void _join(Request& r, const Stri
 		for(int src_row=0; src_row<src.size(); src_row++) {
 			src.set_current(src_row);
 			Array& dest_row=*new(pool) Array(pool);
-			for(int dest_column=0; dest_column<dest_columns->size(); dest_column++) 
-				dest_row+=src.item(*dest_columns->get_string(dest_column));
+			for(int dest_column=0; dest_column<dest_columns->size(); dest_column++) {
+				const String *src_item=src.item(*dest_columns->get_string(dest_column));
+				dest_row+=src_item?src_item:new(pool) String(pool);
+			}
 			dest+=&dest_row;
 		}
 		src.set_current(saved_src_current);
@@ -519,11 +527,6 @@ public:
 static void _sql(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	if(!r.connection)
-		throw Exception(0, 0, 
-			&method_name, 
-			"without connect");
-
 	Value& statement=params->as_junction(0, "statement must be code");
 
 	ulong limit=0;
@@ -545,7 +548,7 @@ static void _sql(Request& r, const Strin
 	Temp_lang temp_lang(r, String::UL_SQL);
 	const String& statement_string=r.process(statement).as_string();
 	const char *statement_cstr=
-		statement_string.cstr(String::UL_UNSPECIFIED, r.connection);
+		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
 	Table_sql_event_handlers handlers(pool, method_name,
 		statement_string, statement_cstr);
 	try {
@@ -554,7 +557,7 @@ static void _sql(Request& r, const Strin
 	//measure:before
 	gettimeofday(&mt[0],NULL);
 #endif	
-		r.connection->query(
+		r.connection(&method_name)->query(
 			statement_cstr, offset, limit, 
 			handlers);