--- parser3/src/classes/table.C	2001/03/21 14:06:42	1.23
+++ parser3/src/classes/table.C	2001/03/25 09:40:54	1.28
@@ -5,10 +5,10 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.23 2001/03/21 14:06:42 paf Exp $
+	$Id: table.C,v 1.28 2001/03/25 09:40:54 paf Exp $
 */
 
-#include <string.h>
+#include "pa_config_includes.h"
 #include "pa_common.h"
 #include "pa_request.h"
 #include "_table.h"
@@ -35,21 +35,18 @@ static void set_or_load(
 		method_name, is_load?"file name must not be junction":"body must be junction");
 
 	// data or file_name
-	char *ldata_or_filename;
+	char *data;
 	if(is_load) {
 		// forcing untaint language
 		String lfile_name(pool);
-		lfile_name.append(vdata_or_filename->as_string(),
-			String::UL_FILE_NAME, true);
-		ldata_or_filename=lfile_name.cstr();
+		lfile_name.append(vdata_or_filename->as_string(), String::UL_FILE_NAME, true);
+		// loading text
+		data=file_read_text(pool, r.absolute(lfile_name));
 	} else {
 		// suggesting untaint language
 		Temp_lang temp_lang(r, String::UL_TABLE);
-		ldata_or_filename=r.process(*vdata_or_filename).as_string().cstr();
+		data=r.process(*vdata_or_filename).as_string().cstr();
 	}
-	// data
-	char *data=is_load?
-		file_read_text(pool, r.absolute(ldata_or_filename)/*\, false*/):ldata_or_filename;
 
 	// parse columns
 	Array *columns;
@@ -72,9 +69,11 @@ static void set_or_load(
 	}
 
 	// parse cells
-	Table& table=*new(pool) Table(pool, method_name, columns);
+	Table& table=*new(pool) Table(pool, &method_name, columns);
 	char *row_chars;
 	while(row_chars=getrow(&data)) {
+		if(!*row_chars) // remove empty lines
+			continue;
 		Array *row=new(pool) Array(pool);
 		while(char *cell_chars=lsplit(&row_chars, '\t')) {
 			String *cell=new(pool) String(pool);
@@ -150,7 +149,7 @@ static void _save(Request& r, const Stri
 
 	// write
 	char *cdata=sdata.cstr();
-	file_write(pool, r.absolute(lfile_name.cstr()), cdata, strlen(cdata), true);
+	file_write(pool, r.absolute(lfile_name), cdata, strlen(cdata), true);
 }
 
 static void _count(Request& r, const String&, Array *) {